diff --git a/src/assets/icons/home.png b/src/assets/icons/home.png
new file mode 100644
index 0000000..b67cb60
Binary files /dev/null and b/src/assets/icons/home.png differ
diff --git a/src/assets/layout/home.fxml b/src/assets/layout/home.fxml
index e0740df..de396a1 100644
--- a/src/assets/layout/home.fxml
+++ b/src/assets/layout/home.fxml
@@ -7,16 +7,16 @@
 <?import javafx.scene.shape.Rectangle?>
 <?import javafx.scene.text.Font?>
 
-<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="830.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1">
+<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="812.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1">
    <children>
-      <Rectangle id="home-back" height="40.0" strokeType="INSIDE" width="830.0" />
+      <Rectangle id="home-back" height="40.0" strokeType="INSIDE" width="812.0" />
       <Label id="lable" layoutX="339.0" layoutY="1.0" text="Home">
          <font>
             <Font name="Centaur" size="31.0" />
          </font>
       </Label>
 
-      <Rectangle id="rectangle-3" height="140.0" layoutX="10.0" layoutY="50.0" width="550.0" />
+      <Rectangle id="rectangle-3" height="140.0" layoutX="10.0" layoutY="50.0" width="540.0" />
       <Label id="lable" layoutX="43.0" layoutY="63.0" text="NEW LAUNCHER">
          <font>
             <Font name="Centaur" size="20.0" />
@@ -29,7 +29,7 @@
          </font>
       </Label>
 
-      <Rectangle id="rectangle-3" height="140.0" layoutX="14.0" layoutY="212.0" width="550.0" />
+      <Rectangle id="rectangle-3" height="140.0" layoutX="14.0" layoutY="212.0" width="540.0" />
       <Label id="lable" layoutX="43.0" layoutY="225.0" text="NEW LAYOUTS">
          <font>
             <Font name="Centaur" size="20.0" />
@@ -59,7 +59,7 @@
          <image>
             <Image url="@../icons/dark-theme.png" />
          </image></ImageView>
-      <ImageView fitHeight="345.0" fitWidth="226.0" layoutX="584.0" layoutY="56.0" pickOnBounds="true" preserveRatio="true">
+      <ImageView fitHeight="345.0" fitWidth="226.0" layoutX="565.0" layoutY="56.0" pickOnBounds="true" preserveRatio="true">
          <image>
             <Image url="@../icons/Creeper.png" />
          </image></ImageView>
diff --git a/src/assets/layout/instance.fxml b/src/assets/layout/instance.fxml
index 6adbfc1..e07c1a3 100644
--- a/src/assets/layout/instance.fxml
+++ b/src/assets/layout/instance.fxml
@@ -8,9 +8,9 @@
 <?import javafx.scene.shape.Rectangle?>
 <?import javafx.scene.text.Font?>
 
-<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="830.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1">
+<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="812.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1">
     <children>
-        <Rectangle id="instance-back" height="40.0" width="830.0" />
+        <Rectangle id="instance-back" height="40.0" width="812.0" />
         <Label id="lable" layoutX="324.0" layoutY="1.0" text="Instances">
             <font>
                 <Font name="Centaur" size="31.0" />
diff --git a/src/assets/layout/main.fxml b/src/assets/layout/main.fxml
index 58e9931..60e7eda 100644
--- a/src/assets/layout/main.fxml
+++ b/src/assets/layout/main.fxml
@@ -19,23 +19,23 @@
             <Font name="Centaur" size="24.0" />
          </font>
       </Label>
-       <Rectangle id="rectangle-1" height="450.0" layoutY="50.0" styleClass="nav-bar" width="86.0" />
-      <Button id="Home-btn" layoutY="50.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="86.0" styleClass="selected" text="Home" textOverrun="CLIP">
+       <Rectangle id="rectangle-1" height="450.0" layoutY="50.0" styleClass="nav-bar" width="88.0" />
+      <Button id="Home-btn" layoutY="50.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="88.0" styleClass="selected" text="Home" textOverrun="CLIP">
          <font>
             <Font name="Centaur" size="16.0" />
          </font>
       </Button>
-      <Button id="Modpacks-btn" layoutY="90.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="86.0" styleClass="tab" text="Modpack" textAlignment="CENTER" textOverrun="CLIP">
+      <Button id="Modpacks-btn" layoutY="90.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="88.0" styleClass="tab" text="Modpack" textAlignment="CENTER" textOverrun="CLIP">
           <font>
               <Font name="Centaur" size="16.0" />
           </font>
       </Button>
-       <Button id="Instance-btn" layoutY="130.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="86.0" styleClass="tab" text="Instances" textOverrun="CLIP">
+       <Button id="Instance-btn" layoutY="130.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="88.0" styleClass="tab" text="Instances" textOverrun="CLIP">
            <font>
                <Font name="Centaur" size="16.0" />
            </font>
        </Button>
-       <Button id="Settings-btn" layoutY="170.0" mnemonicParsing="false" prefHeight="42.0" prefWidth="86.0" styleClass="tab" textOverrun="CLIP">
+       <Button id="Settings-btn" layoutY="170.0" mnemonicParsing="false" prefHeight="42.0" prefWidth="88.0" styleClass="tab" textOverrun="CLIP">
            <font>
                <Font name="Centaur" size="16.0" />
            </font>
@@ -47,7 +47,7 @@
          </graphic>
        </Button>
       <Pane id="tab" layoutX="88.0" layoutY="50.0" prefHeight="450.0" prefWidth="812.0" />
-      <Label id="version" layoutX="282.0" layoutY="14.0" prefHeight="24.0" prefWidth="132.0" text="Version : $v" wrapText="true" />
+      <Label id="version" layoutX="299.0" layoutY="14.0" prefHeight="24.0" prefWidth="132.0" text="Version : $v" wrapText="true" />
       <Label id="lable" layoutX="6.0" layoutY="450.0" prefHeight="50.0" prefWidth="60.0" text="2016 TeamAvion" wrapText="true">
          <font>
             <Font size="11.0" />
diff --git a/src/assets/layout/modpacks.fxml b/src/assets/layout/modpacks.fxml
index bb4bc60..2961803 100644
--- a/src/assets/layout/modpacks.fxml
+++ b/src/assets/layout/modpacks.fxml
@@ -9,16 +9,16 @@
 <?import javafx.scene.shape.Rectangle?>
 <?import javafx.scene.text.Font?>
 
-<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="536.0" prefWidth="750.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1">
+<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="812.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1">
     <children>
-        <Rectangle id="Modpack-back" height="40.0" strokeType="INSIDE" width="750.0" />
+        <Rectangle id="Modpack-back" height="40.0" strokeType="INSIDE" width="812.0" />
         <Label id="lable" layoutX="40.0" layoutY="1.0" text="Modpacks">
             <font>
                 <Font name="Centaur" size="31.0" />
             </font>
         </Label>
-      <TextField id="search-modpacks" layoutX="475.0" layoutY="2.0" prefHeight="37.0" prefWidth="261.0" promptText="Search Modpacks" />
-      <Rectangle id="rectangle-3" height="140.0" layoutX="10.0" layoutY="50.0" width="728.0" />
+      <TextField id="search-modpacks" layoutX="520.0" layoutY="2.0" prefHeight="37.0" prefWidth="290.0" promptText="Search Modpacks" />
+      <Rectangle id="rectangle-3" height="140.0" layoutX="10.0" layoutY="50.0" width="789.0" />
       <ImageView fitHeight="119.0" fitWidth="138.0" layoutX="30.0" layoutY="61.0" pickOnBounds="true" preserveRatio="true">
          <image>
             <Image url="@../icons/modpack-default-img.png" />
@@ -29,11 +29,11 @@
             <Font name="Centaur" size="20.0" />
          </font>
       </Label>
-      <Button id="view-modpack" layoutX="644.0" layoutY="145.0" mnemonicParsing="false" prefHeight="37.0" prefWidth="77.0" text="View" />
-      <Button id="download-modpack" layoutX="553.0" layoutY="145.0" mnemonicParsing="false" prefHeight="37.0" prefWidth="77.0" text="Download" />
+      <Button id="view-modpack" layoutX="714.0" layoutY="145.0" mnemonicParsing="false" prefHeight="37.0" prefWidth="77.0" text="View" />
+      <Button id="download-modpack" layoutX="627.0" layoutY="145.0" mnemonicParsing="false" prefHeight="37.0" prefWidth="77.0" text="Download" />
       <Label id="lable" layoutX="205.0" layoutY="86.0" prefHeight="25.0" prefWidth="480.0" text="Some random text. " wrapText="true" />
 
-        <Rectangle id="rectangle-3" height="140.0" layoutX="10.0" layoutY="200.0" width="728.0" />
+        <Rectangle id="rectangle-3" height="140.0" layoutX="10.0" layoutY="200.0" width="789.0" />
         <ImageView fitHeight="119.0" fitWidth="138.0" layoutX="30.0" layoutY="211.0" pickOnBounds="true" preserveRatio="true">
             <image>
                 <Image url="@../icons/Modpack-modded.png" />
@@ -44,8 +44,8 @@
                 <Font name="Centaur" size="20.0" />
             </font>
         </Label>
-        <Button id="view-modpack-a" layoutX="644.0" layoutY="295.0" mnemonicParsing="false" prefHeight="37.0" prefWidth="77.0" text="View" />
-        <Button id="download-modpack-a" layoutX="553.0" layoutY="295.0" mnemonicParsing="false" prefHeight="37.0" prefWidth="77.0" text="Download" />
+        <Button id="view-modpack-a" layoutX="714.0" layoutY="295.0" mnemonicParsing="false" prefHeight="37.0" prefWidth="77.0" text="View" />
+        <Button id="download-modpack-a" layoutX="627.0" layoutY="295.0" mnemonicParsing="false" prefHeight="37.0" prefWidth="77.0" text="Download" />
         <Label id="lable" layoutX="205.0" layoutY="246.0" prefHeight="25.0" prefWidth="480.0" text="Some random text. " wrapText="true" />
     </children>
 </Pane>
diff --git a/src/assets/layout/settings.fxml b/src/assets/layout/settings.fxml
index e0d6df8..3e6256c 100644
--- a/src/assets/layout/settings.fxml
+++ b/src/assets/layout/settings.fxml
@@ -6,15 +6,15 @@
 <?import javafx.scene.shape.Rectangle?>
 <?import javafx.scene.text.Font?>
 
-<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="830.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1">
+<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="812.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1">
     <children>
-        <Rectangle id="Settings-back" height="40.0" strokeType="INSIDE" width="830.0" />
+        <Rectangle id="Settings-back" height="40.0" strokeType="INSIDE" width="812.0" />
         <Label id="lable" layoutX="331.0" layoutY="1.0" text="Settings">
             <font>
                 <Font name="Centaur" size="31.0" />
             </font>
         </Label>
-      <Rectangle id="rectangle-2" height="40.0" layoutY="40.0" width="830.0" />
+      <Rectangle id="rectangle-2" height="40.0" layoutY="40.0" width="812.0" />
       <Button id="Settings-Gen-btn" layoutY="40.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="100.0" styleClass="selected" text="General" />
       <Button id="Settings-Mine-btn" layoutX="100.0" layoutY="40.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="100.0" styleClass="tab" text="Minecraft">
          <font>
diff --git a/src/assets/layout/settings_generic.fxml b/src/assets/layout/settings_generic.fxml
index 1f48a88..655927c 100644
--- a/src/assets/layout/settings_generic.fxml
+++ b/src/assets/layout/settings_generic.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.text.Font?>
 
-<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="370.0" prefWidth="830.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1">
+<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="370.0" prefWidth="812.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1">
    <children>
       <Label id="lable" layoutX="22.0" layoutY="14.0" text="General Settings">
          <font>
diff --git a/src/assets/layout/settings_minecraft.fxml b/src/assets/layout/settings_minecraft.fxml
index d5dfd91..92e5ef9 100644
--- a/src/assets/layout/settings_minecraft.fxml
+++ b/src/assets/layout/settings_minecraft.fxml
@@ -7,7 +7,7 @@
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.text.Font?>
 
-<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="370.0" prefWidth="830.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1">
+<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="370.0" prefWidth="812.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1">
     <children>
         <Label id="lable" layoutX="22.0" layoutY="14.0" text="Minecraft Settings">
             <font>