diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/Button.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/Button.java
index 9df54b8c478c8772dfb1aac0164fb5bf8f7aa531..e9ceabd3210357040e9e5f12dad2b3fa604fa17d 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/Button.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/Button.java
@@ -101,6 +101,7 @@ public abstract class Button {
         return containsPoint(mouseX, mouseY);
     }
 
+
     /**
      * Left-Click action of the Button.
      */
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/AutofireButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/AutofireButton.java
index 8f6a621cd443275992a2bf68676aa730c5015060..37cc003b8761c7b38ff43c7c8f91bcab567fe051 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/AutofireButton.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/AutofireButton.java
@@ -2,9 +2,12 @@ package com.galaxytrucker.galaxytruckerreloaded.View.Buttons.InGameButtons;
 
 
 import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.audio.Sound;
+import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.galaxytrucker.galaxytruckerreloaded.Main;
+import com.galaxytrucker.galaxytruckerreloaded.Model.Weapons.Weapon;
 import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.Button;
 
 /**
@@ -12,15 +15,32 @@ import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.Button;
  */
 public class AutofireButton extends Button
 {
+    /**
+     * Sprite batch
+     */
+    private SpriteBatch batch;
+    /**
+     * Orthographic camera
+     */
+    private OrthographicCamera camera;
+    /**
+     * Background
+     */
+    private Texture background;
+    /**
+     * Click sound effect
+     */
+    private Sound clickSound;
+
     boolean down = false;
+    Weapon weapon;
 
     /**
      * Constructor
      *
      * @param main - main class
      */
-    public AutofireButton(Main main) {
-    }
+    public AutofireButton(Main main, Weapon weapon) {
 
 //    /**
 //     * Send data to server
@@ -33,11 +53,6 @@ public class AutofireButton extends Button
 //     */
 //    private Packet receiveData() {
 //        return null;
-//    }
-
-    public AutofireButton(int i, int j, Texture autofire_up)
-    {
-        // super(i, j, autofire_up);
     }
 
     public void leftClick()
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/CrewDismissButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/CrewDismissButton.java
index cbf813aa2d40f60e8ebc4989a31e3d7faa2476cf..cd0867123a787c2a1127b26c8ed1dcf69908fde7 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/CrewDismissButton.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/CrewDismissButton.java
@@ -1,11 +1,36 @@
 package com.galaxytrucker.galaxytruckerreloaded.View.Buttons.InGameButtons;
 
+import com.badlogic.gdx.audio.Sound;
+import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.galaxytrucker.galaxytruckerreloaded.Main;
+import com.galaxytrucker.galaxytruckerreloaded.Model.Crew.Crew;
 import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.Button;
 
+/**
+ * Button for dismissing a Crew Member
+ */
 public class CrewDismissButton extends Button
 {
+
+    /**
+     * Sprite batch
+     */
+    private SpriteBatch batch;
+    /**
+     * Orthographic camera
+     */
+    private OrthographicCamera camera;
+    /**
+     * Background
+     */
+    private Texture background;
+    /**
+     * Click sound effect
+     */
+    private Sound clickSound;
+
     private int crewID;
 
     /**
@@ -13,13 +38,12 @@ public class CrewDismissButton extends Button
      *
      * @param main - main class
      */
-    public CrewDismissButton(Main main) {
+    public CrewDismissButton(Main main, Crew crew) {
     }
 
     public void leftClick()
     {
         // dismiss crew
-       // Crew crew = FTLGame.instance().getPlayer().getCrew().get(crewID);
     }
 }
 
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/DoorCloserButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/DoorCloserButton.java
index de1b4f656f687cd24607b69b044c4b2acdc559ca..e1b9de9f1126c6ea262887469bea7759ae9988d3 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/DoorCloserButton.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/DoorCloserButton.java
@@ -1,12 +1,39 @@
 package com.galaxytrucker.galaxytruckerreloaded.View.Buttons.InGameButtons;
 
+import com.badlogic.gdx.audio.Sound;
+import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.galaxytrucker.galaxytruckerreloaded.Main;
+import com.galaxytrucker.galaxytruckerreloaded.Model.Ship;
+//import com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout.Section;
 import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.Button;
 
+/**
+ * Button for closing Door(s) of a Ship-Section
+ */
 public class DoorCloserButton extends Button
 {
-    private System system;
+    /**
+     * Sprite batch
+     */
+    private SpriteBatch batch;
+    /**
+     * Orthographic camera
+     */
+    private OrthographicCamera camera;
+    /**
+     * Background
+     */
+    private Texture background;
+    /**
+     * Click sound effect
+     */
+    private Sound clickSound;
+
+    //private System system;
+    private Ship ship;
+    //private Section section;
 
     /**
      * Constructor
@@ -29,11 +56,14 @@ public class DoorCloserButton extends Button
 //        return null;
 //    }
 
+    /**
+     * Closes Door
+     */
     public void leftClick()
     {
-//        for(Room room : system.getShip().getRooms().values())
+//        for(Section section : system.getShip().getSection().values())
 //        {
-//            for(Door door : room.getDoors())
+//            for(Door door : section.getDoors())
 //            {
 //                door.forceOpen = false;
 //            }
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/DoorOpenerButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/DoorOpenerButton.java
index e0e97b4185eacd74cb3c866f29c0bec83934bc7c..1165524a21dca7a7fe0d0541d61856e59a6be4b6 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/DoorOpenerButton.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/DoorOpenerButton.java
@@ -1,14 +1,41 @@
 package com.galaxytrucker.galaxytruckerreloaded.View.Buttons.InGameButtons;
 
+import com.badlogic.gdx.audio.Sound;
+import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.galaxytrucker.galaxytruckerreloaded.Main;
+import com.galaxytrucker.galaxytruckerreloaded.Model.Ship;
+//import com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout.Section;
 import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.Button;
 
+/**
+ * Button for opening the Door(s) of a Ship-Section
+ */
 public class DoorOpenerButton extends Button
 {
+    /**
+     * Sprite batch
+     */
+    private SpriteBatch batch;
+    /**
+     * Orthographic camera
+     */
+    private OrthographicCamera camera;
+    /**
+     * Background
+     */
+    private Texture background;
+    /**
+     * Click sound effect
+     */
+    private Sound clickSound;
+
     //private System system;
+    private Ship ship;
+    //private Section section;
 
-    // private long lastClick = -1;
+    //private long lastClick = -1;
 
     /**
      * Constructor
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/EquipmentAndUpgradesMenu/EquipmentTabButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/EquipmentAndUpgradesMenu/EquipmentTabButton.java
new file mode 100644
index 0000000000000000000000000000000000000000..65c558bf41a0134e726def17c64ef86e4d9fbb1b
--- /dev/null
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/EquipmentAndUpgradesMenu/EquipmentTabButton.java
@@ -0,0 +1,49 @@
+package com.galaxytrucker.galaxytruckerreloaded.View.Buttons.InGameButtons.EquipmentAndUpgradesMenu;
+
+import com.badlogic.gdx.audio.Sound;
+import com.badlogic.gdx.graphics.OrthographicCamera;
+import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.galaxytrucker.galaxytruckerreloaded.Main;
+import com.galaxytrucker.galaxytruckerreloaded.Model.Ship;
+import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.Button;
+
+/**
+ * Opens the Equipment-Tab in the Menue
+ */
+public class EquipmentTabButton extends Button
+{
+    /**
+     * Sprite batch
+     */
+    private SpriteBatch batch;
+    /**
+     * Orthographic camera
+     */
+    private OrthographicCamera camera;
+    /**
+     * Background
+     */
+    private Texture background;
+    /**
+     * Click sound effect
+     */
+    private Sound clickSound;
+
+    /**
+     * Constructor
+     *
+     * @param main - main class
+     */
+    public EquipmentTabButton(Main main) {
+    }
+
+
+    /**
+     * opens the Equipment-Tap Screen
+     */
+    @Override
+    public void leftClick()
+    {
+    }
+}
\ No newline at end of file
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/UpgradesTabButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/EquipmentAndUpgradesMenu/UpgradesTabButton.java
similarity index 52%
rename from core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/UpgradesTabButton.java
rename to core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/EquipmentAndUpgradesMenu/UpgradesTabButton.java
index 07a819aabd4cb9c1e3f566be441ffe475a7b6628..976c78474ab64916a9182748624f856a8f521668 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/UpgradesTabButton.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/EquipmentAndUpgradesMenu/UpgradesTabButton.java
@@ -1,20 +1,44 @@
-package com.galaxytrucker.galaxytruckerreloaded.View.Buttons.InGameButtons;
+package com.galaxytrucker.galaxytruckerreloaded.View.Buttons.InGameButtons.EquipmentAndUpgradesMenu;
 
+import com.badlogic.gdx.audio.Sound;
+import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.galaxytrucker.galaxytruckerreloaded.Main;
 import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.Button;
 
+/**
+ * Opens the Upgrade-Tab in the Menue
+ */
 public class UpgradesTabButton extends Button
 {
+    /**
+     * Sprite batch
+     */
+    private SpriteBatch batch;
+    /**
+     * Orthographic camera
+     */
+    private OrthographicCamera camera;
+    /**
+     * Background
+     */
+    private Texture background;
+    /**
+     * Click sound effect
+     */
+    private Sound clickSound;
 
     /**
      * Constructor
-     *
      * @param main - main class
      */
     public UpgradesTabButton(Main main) {
     }
 
+    /**
+     * opens the Upgrade-Tab-Screen
+     */
     @Override
     public void leftClick()
    {
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/EquipmentTabButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/EquipmentTabButton.java
deleted file mode 100644
index e59efef0572e8e8ca350e86490db068da9366ce0..0000000000000000000000000000000000000000
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/EquipmentTabButton.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.galaxytrucker.galaxytruckerreloaded.View.Buttons.InGameButtons;
-
-import com.badlogic.gdx.graphics.Texture;
-import com.galaxytrucker.galaxytruckerreloaded.Main;
-import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.Button;
-
-public class EquipmentTabButton extends Button
-{
-    /**
-     * Constructor
-     *
-     * @param main - main class
-     */
-    public EquipmentTabButton(Main main) {
-    }
-
-    @Override
-    public void leftClick()
-    {
-        //if(FTLView.instance().getScreen() instanceof SpaceScreen)
-        //    ((SpaceScreen)FTLView.instance().getScreen()).openGUI(new EquipmentUI(FTLGame.instance().getPlayer()));
-    }
-}
\ No newline at end of file
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/ShipButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/ShipButton.java
index b2a46a3e2da47995bb09ff52247cc0ded1a3fa70..e68ae8c44e22dea95d6199ee2c2509b776990f8b 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/ShipButton.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/ShipButton.java
@@ -1,24 +1,51 @@
 package com.galaxytrucker.galaxytruckerreloaded.View.Buttons.InGameButtons;
 
+import com.badlogic.gdx.audio.Sound;
+import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.galaxytrucker.galaxytruckerreloaded.Main;
+import com.galaxytrucker.galaxytruckerreloaded.Model.Ship;
 import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.Button;
 
+/**
+ * Button for opening the Ship-Interface
+ * */
 public class ShipButton extends Button
 {
+    /**
+     * Sprite batch
+     */
+    private SpriteBatch batch;
+    /**
+     * Orthographic camera
+     */
+    private OrthographicCamera camera;
+    /**
+     * Background
+     */
+    private Texture background;
+    /**
+     * Click sound effect
+     */
+    private Sound clickSound;
 
+    private Ship ship;
     /**
      * Constructor
      *
      * @param main - main class
+     * @param ship - the current Ship
      */
-    public ShipButton(Main main) {
+    public ShipButton(Main main, Ship ship) {
     }
 
+
+    /**
+     * opens the Ship-Screen of the cureent Ship
+     */
     public void leftClick()
     {
-        //if(FTLView.instance().getScreen() instanceof SpaceScreen)
-        //    ((SpaceScreen)FTLView.instance().getScreen()).openUpgradeGUI();
 
     }
 }
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/SystemButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/SystemButton.java
index adde545791e9b56635cbb7c85f2c422048c3633b..8c4e42de95da027d5b33c8adbf8964cbb10945c2 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/SystemButton.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/SystemButton.java
@@ -1,13 +1,36 @@
 package com.galaxytrucker.galaxytruckerreloaded.View.Buttons.InGameButtons;
 
 import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.audio.Sound;
+import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.galaxytrucker.galaxytruckerreloaded.Main;
 import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.Button;
 
+/**
+ * Button for regulation of (Sub)-System energie supplyment
+ */
 public class SystemButton extends Button
 {
+    /**
+     * Sprite batch
+     */
+    private SpriteBatch batch;
+    /**
+     * Orthographic camera
+     */
+    private OrthographicCamera camera;
+    /**
+     * Background
+     */
+    private Texture background;
+    /**
+     * Click sound effect
+     */
+    private Sound clickSound;
+
+
     private System system;
 
     private Texture image_off;
@@ -34,39 +57,10 @@ public class SystemButton extends Button
         this.image_hover_off = image_hover_off;
     }
 
-//    public void render(SpriteBatch batch)
-//    {
-//        int mouseX = Gdx.input.getX();
-//        int mouseY = Gdx.graphics.getHeight() - Gdx.input.getY();
-//
-//        boolean oldHovering = hover;
-//        hover = containsPoint(mouseX, mouseY);
-//        if(hover == true && oldHovering == false)
-//        {
-//            Sounds.playSound("buttonHover");
-//        }
-//
-//        if(hover)
-//        {
-//            if(system.getPower() > 0)
-//                batch.setColor(120/256f, 1, 120/256f, 1);
-//            batch.draw(glow, imageX + 8, imageY + 8);
-//            batch.setColor(1, 1, 1, 1);
-//
-//            if(system.getPower() > 0)
-//                batch.draw(image_hover, imageX, imageY);
-//            else
-//                batch.draw(image_hover_off, imageX, imageY);
-//        }
-//        else
-//        {
-//            if(system.getPower() > 0)
-//                batch.draw(image_up, imageX, imageY);
-//            else
-//                batch.draw(image_off, imageX, imageY);
-//        }
-//    }
 
+    /**
+     * decrease the Energie provided for a System
+     */
     public void rightClick()
     {
 //        int power = -1;
@@ -101,6 +95,9 @@ public class SystemButton extends Button
 //        }
     }
 
+    /**
+     * increases the Energie provided for a System
+     */
     @Override
     public void leftClick(){
 //    {
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/DifficultyButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/DifficultyButton.java
index 417b4a67ea624a20670673ce4bd5a93d0edcc67d..3e666fcf7242db8e820ab5edda61039f8b3de693 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/DifficultyButton.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/DifficultyButton.java
@@ -1,11 +1,34 @@
 package com.galaxytrucker.galaxytruckerreloaded.View.Buttons.MenuButtons;
 
+import com.badlogic.gdx.audio.Sound;
+import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.galaxytrucker.galaxytruckerreloaded.Main;
 import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.Button;
 
+/**
+ * Button for setting the degree of diffiulty
+ */
 public class DifficultyButton extends Button
 {
+    /**
+     * Sprite batch
+     */
+    private SpriteBatch batch;
+    /**
+     * Orthographic camera
+     */
+    private OrthographicCamera camera;
+    /**
+     * Background
+     */
+    private Texture background;
+    /**
+     * Click sound effect
+     */
+    private Sound clickSound;
+
     private int difficulty;
 
         /**
@@ -19,6 +42,7 @@ public class DifficultyButton extends Button
     /**
      * Sets difficutly to a specific level
      */
+    @Override
     public void leftClick()
     {
         // setDifficulty(difficulty);
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/NewGameButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/NewGameButton.java
index a83207669ac894a8efed36b50f6e886e1b6859b4..6b7cb328b2b3f300dac9c9599556faf283e874cf 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/NewGameButton.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/NewGameButton.java
@@ -1,11 +1,33 @@
 package com.galaxytrucker.galaxytruckerreloaded.View.Buttons.MenuButtons;
 
+import com.badlogic.gdx.audio.Sound;
+import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.galaxytrucker.galaxytruckerreloaded.Main;
 import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.Button;
 
+/**
+ * Starts a new Game
+ */
 public class NewGameButton extends Button
 {
+    /**
+     * Sprite batch
+     */
+    private SpriteBatch batch;
+    /**
+     * Orthographic camera
+     */
+    private OrthographicCamera camera;
+    /**
+     * Background
+     */
+    private Texture background;
+    /**
+     * Click sound effect
+     */
+    private Sound clickSound;
 
     /**
      * Constructor
@@ -28,8 +50,10 @@ public class NewGameButton extends Button
 //        return null;
 //    }
 
+    /**
+     * Creats new Game
+     */
     public void leftClick()
     {
-        // FTLView.instance().setScreen(new HangerScreen());
     }
 }
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/QuitButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/QuitButton.java
index c7ad270dfb4732008f8bc3865eb6ce24e16613e3..5fef1507fa43ed42ce6e833a0bc6f9cec7cf03bb 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/QuitButton.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/QuitButton.java
@@ -1,11 +1,34 @@
 package com.galaxytrucker.galaxytruckerreloaded.View.Buttons.MenuButtons;
 
+import com.badlogic.gdx.audio.Sound;
+import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.galaxytrucker.galaxytruckerreloaded.Main;
 import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.Button;
 
+/**
+ * Ends the Game
+ */
 public class QuitButton extends Button
 {
+    /**
+     * Sprite batch
+     */
+    private SpriteBatch batch;
+    /**
+     * Orthographic camera
+     */
+    private OrthographicCamera camera;
+    /**
+     * Background
+     */
+    private Texture background;
+    /**
+     * Click sound effect
+     */
+    private Sound clickSound;
+
     /**
      * Constructor
      *
@@ -27,6 +50,9 @@ public class QuitButton extends Button
 //        return null;
 //    }
 
+    /**
+     * Ends the Game
+     */
     @Override
     public void leftClick()
     {
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/StartButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/StartButton.java
index 39df52d9083b8cf31b5f37606044d1de8667b666..2d0d8fe99c39a94d33b3c8bb5da3a17c662c9740 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/StartButton.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/StartButton.java
@@ -1,11 +1,34 @@
 package com.galaxytrucker.galaxytruckerreloaded.View.Buttons.MenuButtons;
 
+import com.badlogic.gdx.audio.Sound;
+import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.galaxytrucker.galaxytruckerreloaded.Main;
 import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.Button;
 
+/**
+ * Starts a new Game
+ */
 public class StartButton extends Button
 {
+    /**
+     * Sprite batch
+     */
+    private SpriteBatch batch;
+    /**
+     * Orthographic camera
+     */
+    private OrthographicCamera camera;
+    /**
+     * Background
+     */
+    private Texture background;
+    /**
+     * Click sound effect
+     */
+    private Sound clickSound;
+
 
     /**
      * Constructor