diff --git a/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/InventoryListener.java b/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/InventoryListener.java
index 443ffae..6fe8732 100644
--- a/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/InventoryListener.java
+++ b/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/InventoryListener.java
@@ -8,6 +8,7 @@ public class InventoryListener implements Listener{
     @EventHandler
     public void onPvpMenuInteract(InventoryInteractEvent e) {
         Player p = e.getWhoClicked();
+		Inventory inv = e.getInventory();
         String invtitle = e.getView().getTitle();
         if (invtitle.equals("PvP-Menu")) {
             event.setCancled(true);
@@ -17,39 +18,27 @@ public class InventoryListener implements Listener{
                         p.closeInventory;
                         break;
                     case "Ultra an/aus schalten":
-                        ItemStack iultra = new ItemStack(Material.DIAMOND_SWORD);
-                        ItemMeta multra = iultra.getItemMeta();
                         multra.setDispalyName("Ultra an/aus schalten");
                         if (pdc.has(ultra, PersistentDataType.BOOLEAN)) {
                             pdc.set(ultra, PersistentDataType.BOOLEAN, !pdc.get(ultra, PersistentDataType.BOOLEAN));
                             sender.sendMessage("PvP-Ultra ist für dich jetzt " + (pdc.get(pvptoggle, PersistentDataType.BOOLEAN)?"an":"aus"));
-                            multra.setLore(ChatColor.BLUE + p.getPersistentDataContainer.get(new NamespacedKey(Pvptoggle.pvptoggle, "pvpultra"), PersistentDataType.BOOLEAN)?"Aus":"An" + " schalten");
-                            iultra.setItemMeta(multra);
-                            inv.setItem(12, iultra);
+                            inv.setItem(12, InventoryMenu.getMenuItem(1));
                         } else {
                             pdc.set(ultra, PersistentDataContainer.BOOLEAN, true);
                             sender.sendMessage("PvP-Ultra ist für dich jetzt " + (pdc.get(pvptoggle, PersistentDataType.BOOLEAN)?"an":"aus"));
-                            multra.setLore(ChatColor.BLUE + p.getPersistentDataContainer.get(new NamespacedKey(Pvptoggle.pvptoggle, "pvpultra"), PersistentDataType.BOOLEAN)?"Aus":"An" + " schalten");
-                            iultra.setItemMeta(multra);
-                            inv.setItem(12, iultra);
+                            inv.setItem(12, InventoryMenu.getMenuItem(1));
                         }
                         break;
                     case "PvP-Schutz an/aus schalten":
-                        ItemStack itoggle = new ItemStack(Material.IRON_SWORD);
-                        ItemMeta mtoggle = itoggle.getItemMeta();
                         mtoggle.setDispalyName("PvP-Schutz an/aus schalten");
                         if (pdc.has(pvptoggle, PersistentDataType.BOOLEAN)) {
                             pdc.set(pvptoggle, PersistentDataType.BOOLEAN, !pdc.get(pvptoggle, PersistentDataType.BOOLEAN));
                             sender.sendMessage("Dein PvP-Schutz ist jetzt " + (pdc.get(pvptoggle, PersistentDataType.BOOLEAN)?"an":"aus"));
-                            mtoggle.setLore(ChatColor.BLUE + p.getPersistentDataContainer.get(new NamespacedKey(Pvptoggle.pvptoggle, "pvptoggle"), PersistentDataType.BOOLEAN)?"Aus":"An" + " schalten");
-                            itoggle.setItemMeta(mtoggle);
-                            inv.setItem(10, itoggle);
+                            inv.setItem(10, InventoryMenu.getMenuItem(0));
                         } else {
                             pdc.set(pvptoggle, PersistentDataType.BOOLEAN, Config.getPvpProt());
                             sender.sendMessage("Dein PvP-Schutz ist jetzt " + (pdc.get(pvptoggle, "pvptoggle"), PersistentDataType.BOOLEAN)?"an":"aus"));
-                            mtoggle.setLore(ChatColor.BLUE + p.getPersistentDataContainer.get(new NamespacedKey(Pvptoggle.pvptoggle, "pvptoggle"), PersistentDataType.BOOLEAN)?"Aus":"An" + " schalten");
-                            itoggle.setItemMeta(mtoggle);
-                            inv.setItem(10, itoggle);
+                            inv.setItem(10, InventoryMenu.getMenuItem(0));
                         }
                         break;
                     case "Whitelist":
@@ -93,19 +82,44 @@ public class InventoryListener implements Listener{
             if (event.getCurrendItem != null) {
                 switch (e.getCurrendItem().getItemMeta().getDiplayName()) {
                 case "Inventar schließen":
-                        p.closeInventory;
-                        break;
+                    p.closeInventory;
+                    break;
                 case "Zurück":
-                        p.closeInventory;
-                        p.openInventory(InventoryMenu.pvpMenu(p));
-                        break;
-                }
+                    p.closeInventory;
+                    p.openInventory(InventoryMenu.pvpMenu(p));
+                    break;
+				case "Standard PvP-Schutz an/aus schalten":
+					Config.setPvpProt(!Config.getPvpProt());
+					inv.set(11, InventoryMenu.getMenuItem(8));
+					break;
+				case "Zeit um zurückzuschlagen erhöhen":
+					if (ture) {
+						Config.setPvpTime(getPvpTime() + 1);
+					} else if (true) {
+						Config.setPvpTime(getPvpTime() + 10);
+					}
+					inv.setItem(15, InventoryMenu.getMenuItem(9));
+					break;
+				case "Zeit um zurückzuschlagen erniedrigen":
+					if (true) {
+						Config.setPvpTime(getPvpTime() - 1);
+					} else if (true) {
+						Config.setPvpTime(getPvpTime() - 10);
+					}
+					inv.setItem(15, InventoryMenu.getMenuItem(9));
+                	break;
+				}
             }
         }
     }
     
     public void onPvpMenuItemMove(InventoryMoveItemEvent e) {
-        if (e.getInventory().getName().equals("PvP-Menu")) {
+		String invtitle = e.getView().getTitle();
+        if (invtitle.equals("PvP-Menu") || 
+				invtitle.equals("Operator-Menu") || 
+				invtitle.equals("Blacklist-Menu") || 
+				invtitle.equals("Whitelist-Menu")) {
+			
             event.setCancled(true);
         }
     }