diff --git a/src/Launcher/Main.java b/src/Launcher/Main.java
index 151c63c..3202afe 100644
--- a/src/Launcher/Main.java
+++ b/src/Launcher/Main.java
@@ -22,6 +22,8 @@ import javafx.scene.layout.Pane;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
+
+import javafx.scene.input.KeyEvent;
 import java.net.URL;
 import com.tofvesson.async.*;
 
@@ -30,7 +32,7 @@ public class Main extends Application {
     public static final URL mainLauncher = Main.class.getResource("../assets/layout/main.fxml");                        // Launcher body
 
     private double xOffset = 0, yOffset = 0;                                                                            // Offsets for dragging
-    private Button exit, min, Home_btn, Modpack_btn, Settings_btn, Search_modpacks_btn;                                 // Define buttons
+    private Button exit, min, Home_btn, Modpack_btn, Settings_btn;                                 // Define buttons
     private ImageView icon;
     private TextField Search_modpacks;
     private Image appIcon;
@@ -60,7 +62,6 @@ public class Main extends Application {
         Settings_btn = (Button) root.lookup("#Settings-btn");
         tab = (Pane) root.lookup("#tab");
         icon = (ImageView) root.lookup("#icon");
-        Search_modpacks_btn = (Button) root.lookup("#search-modpacks-btn");
         Search_modpacks = (TextField) root.lookup("#search-modpacks");
 
 
@@ -72,6 +73,8 @@ public class Main extends Application {
             if(activeTab!=Tabs.Modpacks){
                 (activeTab=Tabs.Modpacks).switchTab(tab);                                                               // Sets the active tab to the modpacks tab unless it's already active
                 Tabs.Modpacks.loaded.lookup("#search-modpacks").setOnInputMethodTextChanged(System.out::println);
+                //TODO: Create a dynamic updating string for the input
+
             }
         });
         Settings_btn.setOnMouseClicked(event ->{
diff --git a/src/assets/layout/home.fxml b/src/assets/layout/home.fxml
index 3332623..229fbf3 100644
--- a/src/assets/layout/home.fxml
+++ b/src/assets/layout/home.fxml
@@ -1,16 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.Pane?>
+<?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="750.0" stylesheets="@../style/nav.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
    <children>
-      <Label layoutX="333.0" layoutY="14.0" text="Home" textFill="WHITE" underline="true">
+      <Rectangle id="Modpack-back" arcHeight="5.0" arcWidth="5.0" height="55.0" strokeType="INSIDE" width="750.0" />
+      <Label layoutX="54.0" layoutY="9.0" text="Home" textFill="WHITE">
          <font>
             <Font name="Centaur" size="31.0" />
          </font>
       </Label>
+      <Label layoutX="314.0" layoutY="15.0" text="This is a Dev Build ... things are subject to change" textFill="RED">
+         <font>
+            <Font name="Centaur" size="21.0" />
+         </font>
+      </Label>
    </children>
 </Pane>
diff --git a/src/assets/layout/main.fxml b/src/assets/layout/main.fxml
index 51f84c1..3cf22f3 100644
--- a/src/assets/layout/main.fxml
+++ b/src/assets/layout/main.fxml
@@ -13,7 +13,7 @@
       <Button id="exit" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="862.0" layoutY="13.0" mnemonicParsing="false" stylesheets="@../style/nav.css" text="X" textFill="WHITE" />
        <Button id="min" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="841.0" layoutY="13.0" mnemonicParsing="false" stylesheets="@../style/nav.css" text="-" textFill="WHITE" />
        <ImageView id="icon" fitHeight="30" fitWidth="30" layoutX="26.0" layoutY="11.0" />
-       <Label layoutX="70.0" layoutY="11.0" text="Team-Avion Launcher" textFill="WHITE">
+       <Label layoutX="75.0" layoutY="11.0" text="Team-Avion Launcher" textFill="WHITE">
          <font>
             <Font name="Centaur" size="24.0" />
          </font>
diff --git a/src/assets/layout/modpacks.fxml b/src/assets/layout/modpacks.fxml
index 1f2595a..d235d40 100644
--- a/src/assets/layout/modpacks.fxml
+++ b/src/assets/layout/modpacks.fxml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.Pane?>
+<?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="750.0" stylesheets="@../style/nav.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
     <children>
-        <Label layoutX="63.0" layoutY="23.0" text="Modpacks" textFill="WHITE">
+        <Rectangle id="Modpack-back" arcHeight="5.0" arcWidth="5.0" height="55.0" strokeType="INSIDE" width="750.0" />
+        <Label layoutX="34.0" layoutY="9.0" text="Modpacks" textFill="WHITE">
             <font>
                 <Font name="Centaur" size="31.0" />
             </font>
         </Label>
-      <TextField id="search-modpacks" layoutX="269.0" layoutY="23.0" prefHeight="25.0" prefWidth="212.0" promptText="Search Modpacks" />
-      <Button id="search-modpacks-btn" layoutX="553.0" layoutY="30.0" mnemonicParsing="false" text="Search available Modpacks" textFill="white" />
+      <TextField id="search-modpacks" layoutX="524.0" layoutY="9.0" prefHeight="25.0" prefWidth="212.0" promptText="Search Modpacks" />
     </children>
 </Pane>
diff --git a/src/assets/layout/settings.fxml b/src/assets/layout/settings.fxml
index 7206b9e..30abf17 100644
--- a/src/assets/layout/settings.fxml
+++ b/src/assets/layout/settings.fxml
@@ -2,15 +2,16 @@
 
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.Pane?>
+<?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="750.0" stylesheets="@../style/nav.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
     <children>
-        <Label layoutX="333.0" layoutY="14.0" text="Settings" textFill="WHITE" underline="true">
+        <Rectangle id="Modpack-back" arcHeight="5.0" arcWidth="5.0" height="55.0" strokeType="INSIDE" width="750.0" />
+        <Label layoutX="331.0" layoutY="9.0" text="Settings" textFill="WHITE">
             <font>
                 <Font name="Centaur" size="31.0" />
             </font>
         </Label>
     </children>
-</Pane>
\ No newline at end of file
+</Pane>
diff --git a/src/assets/style/nav.css b/src/assets/style/nav.css
index 33b8670..bf8de3b 100644
--- a/src/assets/style/nav.css
+++ b/src/assets/style/nav.css
@@ -4,6 +4,9 @@
 #rectangle {
     -fx-fill: #031128;
 }
+#Modpack-back {
+    -fx-fill: #042344;
+}
 #exit, #min{
     -fx-background-color: rgba(30, 25, 25, 0);
 }
@@ -17,13 +20,8 @@
     -fx-background-color: #0c182d;
     -fx-background-radius: 0em;
 }
-#search-modpacks-btn {
-    -fx-background-color: #031128;
-}
-#search-modpacks-btn:hover  {
-    -fx-background-color: #0c182d;
-}
 #search-modpacks {
+    -fx-text-inner-color: white;
     -fx-background-color: rgba(0, 0, 0, 0.5);
     -fx-padding: 10px;
 }
\ No newline at end of file