diff --git a/src/main/resources/fxml/Layout.fxml b/src/main/resources/fxml/Layout.fxml
deleted file mode 100644
index f928598..0000000
--- a/src/main/resources/fxml/Layout.fxml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.Menu?>
-<?import javafx.scene.control.MenuBar?>
-<?import javafx.scene.control.MenuItem?>
-<?import javafx.scene.control.ScrollBar?>
-<?import javafx.scene.control.SplitPane?>
-<?import javafx.scene.control.Tab?>
-<?import javafx.scene.control.TabPane?>
-<?import javafx.scene.control.ToolBar?>
-<?import javafx.scene.control.TreeView?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.text.TextFlow?>
-
-
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
-   <children>
-      <TabPane layoutX="132.0" prefHeight="33.0" prefWidth="453.0" tabClosingPolicy="UNAVAILABLE">
-        <tabs>
-          <Tab text="Untitled Tab 1">
-            <content>
-              <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
-            </content>
-          </Tab>
-          <Tab text="Untitled Tab 2">
-            <content>
-              <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
-            </content>
-          </Tab>
-        </tabs>
-      </TabPane>
-      <ScrollBar layoutX="586.0" orientation="VERTICAL" prefHeight="369.0" prefWidth="14.0" />
-      <MenuBar layoutY="4.0" prefHeight="25.0" prefWidth="132.0">
-        <menus>
-          <Menu mnemonicParsing="false" text="File">
-            <items>
-              <MenuItem mnemonicParsing="false" text="Close" />
-            </items>
-          </Menu>
-          <Menu mnemonicParsing="false" text="Edit">
-            <items>
-              <MenuItem mnemonicParsing="false" text="Delete" />
-            </items>
-          </Menu>
-          <Menu mnemonicParsing="false" text="Help">
-            <items>
-              <MenuItem mnemonicParsing="false" text="About" />
-            </items>
-          </Menu>
-        </menus>
-      </MenuBar>
-      <SplitPane dividerPositions="0.75" layoutY="356.0" orientation="VERTICAL" prefHeight="8.0" prefWidth="132.0">
-        <items>
-          <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="100.0" prefWidth="160.0" />
-          <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="100.0" prefWidth="160.0" />
-        </items>
-      </SplitPane>
-      <TreeView layoutY="28.0" prefHeight="329.0" prefWidth="132.0" />
-      <TextFlow layoutX="132.0" layoutY="29.0" prefHeight="323.0" prefWidth="453.0" />
-      <ScrollBar layoutX="132.0" layoutY="353.0" prefHeight="8.0" prefWidth="453.0" />
-      <ToolBar layoutY="367.0" prefHeight="33.0" prefWidth="600.0" />
-   </children>
-</AnchorPane>
diff --git a/src/main/resources/fxml/Main.fxml b/src/main/resources/fxml/Main.fxml
index 53d2f66..cf31755 100644
--- a/src/main/resources/fxml/Main.fxml
+++ b/src/main/resources/fxml/Main.fxml
@@ -1,13 +1,81 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.net.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Menu?>
+<?import javafx.scene.control.MenuBar?>
+<?import javafx.scene.control.MenuItem?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.control.SplitPane?>
+<?import javafx.scene.control.ToolBar?>
+<?import javafx.scene.control.TreeView?>
+<?import javafx.scene.control.TreeItem?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.text.TextFlow?>
 
-<VBox>
-    <children>
-        <Label text="Hello world!"/>
-    </children>
-</VBox>
+<BorderPane 
+  prefWidth="600"
+  prefHeight="400"
+  xmlns="http://javafx.com/javafx/8.0.65"
+  xmlns:fx="http://javafx.com/fxml/1">
+
+  <top>
+    <MenuBar prefHeight="25.0">
+    <menus>
+      <Menu mnemonicParsing="false" text="File">
+        <items>
+          <MenuItem mnemonicParsing="false" text="Close" />
+        </items>
+      </Menu>
+      <Menu mnemonicParsing="false" text="Edit">
+        <items>
+          <MenuItem mnemonicParsing="false" text="Delete" />
+        </items>
+      </Menu>
+      <Menu mnemonicParsing="false" text="Help">
+        <items>
+          <MenuItem mnemonicParsing="false" text="About" />
+        </items>
+      </Menu>
+    </menus>
+    </MenuBar>
+  </top>
+
+  <center>
+    <SplitPane
+      dividerPositions="0.25"
+      orientation="HORIZONTAL">
+    <items>
+  
+      <!-- File tree -->
+      <ScrollPane>
+      <content>
+        <TreeView
+          fx:id="filetree"
+          prefHeight="${filetree.parent.height}"
+          prefWidth="${filetree.parent.width}"/>
+      </content>
+      </ScrollPane>
+
+      <!-- Editor -->
+      <ScrollPane>
+      <content>
+        <TextFlow
+          id="editor"
+          prefHeight="${editor.parent.height}"
+          prefWidth="${editor.parent.width}"/>
+      </content>
+      </ScrollPane>
+  
+    </items>
+    </SplitPane>
+  </center>
+  
+  <bottom>
+    <HBox id="modeline" prefHeight="25.0">
+      <Label text="Modeline :)"/>
+    </HBox>
+  </bottom>
+
+</BorderPane>