diff --git a/README.md b/README.md
index b91fcc2..066128f 100644
--- a/README.md
+++ b/README.md
@@ -1 +1 @@
-ultimatemoderation
+# UltimateModeration
diff --git a/pom.xml b/pom.xml
index cc4469f..f6bd6d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <groupId>com.songoda</groupId>
     <artifactId>UltimateModeration</artifactId>
     <modelVersion>4.0.0</modelVersion>
-    <version>2.0.5</version>
+    <version>2.0.6</version>
     <build>
         <defaultGoal>clean install</defaultGoal>
         <finalName>UltimateModeration-${project.version}</finalName>
diff --git a/src/main/java/com/songoda/ultimatemoderation/gui/TemplateManagerGui.java b/src/main/java/com/songoda/ultimatemoderation/gui/TemplateManagerGui.java
index 631b42b..2bc84c4 100644
--- a/src/main/java/com/songoda/ultimatemoderation/gui/TemplateManagerGui.java
+++ b/src/main/java/com/songoda/ultimatemoderation/gui/TemplateManagerGui.java
@@ -23,6 +23,8 @@ public class TemplateManagerGui extends Gui {
     private PunishmentType punishmentType = PunishmentType.ALL;
     private final Player player;
 
+    private int page = 1;
+
     public TemplateManagerGui(UltimateModeration plugin, Player player) {
         super(6);
         setDefaultItem(null);
@@ -30,24 +32,35 @@ public class TemplateManagerGui extends Gui {
         this.player = player;
 
         setTitle(plugin.getLocale().getMessage("gui.templatemanager.title").getMessage());
-        showPage();
+        toCurrentPage();
     }
 
-    protected void showPage() {
-        if (inventory != null)
+    private void toPrevPage() {
+        if (this.page <= 1) {
+            return;
+        }
+
+        --this.page;
+        toCurrentPage();
+    }
+
+    private void toNextPage() {
+        if (findTemplates(this.page + 1, this.punishmentType).size() > 0) {
+            ++this.page;
+            toCurrentPage();
+        }
+    }
+
+    private void toCurrentPage() {
+        if (inventory != null) {
             inventory.clear();
+        }
+
         setActionForRange(0, 53, null);
 
         int numTemplates = plugin.getTemplateManager().getTemplates().size();
         this.pages = (int) Math.floor(numTemplates / 28.0);
 
-        List<Template> templates = plugin.getTemplateManager().getTemplates().stream().skip((page - 1) * 28).limit(28)
-                .collect(Collectors.toList());
-
-        setNextPage(0, 5, GuiUtils.createButtonItem(CompatibleMaterial.ARROW, plugin.getLocale().getMessage("gui.general.next").getMessage()));
-        setPrevPage(0, 1, GuiUtils.createButtonItem(CompatibleMaterial.ARROW, plugin.getLocale().getMessage("gui.general.back").getMessage()));
-        setOnPage((event) -> showPage());
-
         // decorate the edges
         ItemStack glass2 = GuiUtils.getBorderItem(Settings.GLASS_TYPE_2.getMaterial(CompatibleMaterial.BLUE_STAINED_GLASS_PANE));
         ItemStack glass3 = GuiUtils.getBorderItem(Settings.GLASS_TYPE_3.getMaterial(CompatibleMaterial.LIGHT_BLUE_STAINED_GLASS_PANE));
@@ -65,27 +78,30 @@ public class TemplateManagerGui extends Gui {
                 (event) -> {
                     this.punishmentType = punishmentType.nextFilter();
                     this.page = 1;
-                    showPage();
+                    toCurrentPage();
                 });
 
         setButton(5, 4, GuiUtils.createButtonItem(CompatibleMaterial.OAK_DOOR,
-                plugin.getLocale().getMessage("gui.general.back").getMessage()),
+                        plugin.getLocale().getMessage("gui.general.back").getMessage()),
                 (event) -> guiManager.showGUI(event.player, new MainGui(plugin, event.player)));
 
-        if (player.hasPermission("um.templates.create"))
+        if (player.hasPermission("um.templates.create")) {
             setButton(5, 5, GuiUtils.createButtonItem(CompatibleMaterial.REDSTONE,
-                    plugin.getLocale().getMessage("gui.templatemanager.create").getMessage()),
+                            plugin.getLocale().getMessage("gui.templatemanager.create").getMessage()),
                     (event) -> guiManager.showGUI(event.player, new PunishGui(plugin, null, null, player)));
+        }
+
+        List<Template> templates = findTemplates(this.page, this.punishmentType);
 
-        if (punishmentType != PunishmentType.ALL)
-            templates.removeIf(template -> template.getPunishmentType() != punishmentType);
         int num = 11;
         for (Template template : templates) {
-            if (num == 16 || num == 36)
+            if (num == 16 || num == 36) {
                 num = num + 2;
+            }
+
             setButton(num, GuiUtils.createButtonItem(CompatibleMaterial.MAP, TextUtils.formatText("&6&l" + template.getName()),
-                    plugin.getLocale().getMessage("gui.templatemanager.leftclick").getMessage(),
-                    plugin.getLocale().getMessage("gui.templatemanager.rightclick").getMessage()),
+                            plugin.getLocale().getMessage("gui.templatemanager.leftclick").getMessage(),
+                            plugin.getLocale().getMessage("gui.templatemanager.rightclick").getMessage()),
                     (event) -> {
                         if (event.clickType == ClickType.LEFT) {
                             if (player.hasPermission("um.templates.edit"))
@@ -95,11 +111,23 @@ public class TemplateManagerGui extends Gui {
                                 plugin.getTemplateManager().removeTemplate(template);
                                 plugin.getDataManager().deleteTemplate(template);
                             }
-                            showPage();
+
+                            toCurrentPage();
                         }
                     });
-            num++;
+
+            ++num;
         }
+
+        setButton(0, 3, GuiUtils.createButtonItem(CompatibleMaterial.ARROW, plugin.getLocale().getMessage("gui.general.back").getMessage()), (event) -> toPrevPage());
+        setButton(0, 5, GuiUtils.createButtonItem(CompatibleMaterial.ARROW, plugin.getLocale().getMessage("gui.general.next").getMessage()), (event) -> toNextPage());
     }
 
+    private List<Template> findTemplates(int page, PunishmentType punishmentType) {
+        return plugin.getTemplateManager().getTemplates().stream()
+                .filter(template -> punishmentType == PunishmentType.ALL || template.getPunishmentType() == punishmentType)
+                .skip((page - 1) * 28L)
+                .limit(28)
+                .collect(Collectors.toList());
+    }
 }
diff --git a/src/main/java/com/songoda/ultimatemoderation/gui/TicketManagerGui.java b/src/main/java/com/songoda/ultimatemoderation/gui/TicketManagerGui.java
index d237d28..3bd8412 100644
--- a/src/main/java/com/songoda/ultimatemoderation/gui/TicketManagerGui.java
+++ b/src/main/java/com/songoda/ultimatemoderation/gui/TicketManagerGui.java
@@ -20,6 +20,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
+// FIXME: Pagination not working (probably in other GUIs too) (copy own one from TemplateManagerGui)
 public class TicketManagerGui extends Gui {
 
     private final UltimateModeration plugin;
@@ -142,7 +143,6 @@ public class TicketManagerGui extends Gui {
                     (event) -> guiManager.showGUI(player, new TicketGui(plugin, ticket, toModerate, player)));
             num++;
         }
-
     }
 
     public static void createNew(Player player, OfflinePlayer toModerate) {