diff --git a/res/userdb.db b/res/userdb.db
new file mode 100644
index 0000000..b513673
Binary files /dev/null and b/res/userdb.db differ
diff --git a/src/main/java/seng202/group9/GUI/AirlineRDController.java b/src/main/java/seng202/group9/GUI/AirlineRDController.java
index 854651b..bbfd2e2 100644
--- a/src/main/java/seng202/group9/GUI/AirlineRDController.java
+++ b/src/main/java/seng202/group9/GUI/AirlineRDController.java
@@ -61,9 +61,9 @@ public class AirlineRDController extends MenuController {
     public void loadTables() {
         airlIDcol.setCellValueFactory(new PropertyValueFactory<Airline, String>("ID"));
         airlNamecol.setCellValueFactory(new PropertyValueFactory<Airline, String>("Name"));
-        airlAliascol.setCellValueFactory(new PropertyValueFactory<Airline, String>("Alias"));
+        airlAliascol.setCellValueFactory(new PropertyValueFactory<Airline, String>("ICAO"));
         //Need to check IATA and ICAO
-        airlIATAcol.setCellValueFactory(new PropertyValueFactory<Airline, String>("ICAO"));
+        airlIATAcol.setCellValueFactory(new PropertyValueFactory<Airline, String>("Alias"));
         airlICAOcol.setCellValueFactory(new PropertyValueFactory<Airline, String>("IATA"));
         airlCallsigncol.setCellValueFactory(new PropertyValueFactory<Airline, String>("CallSign"));
         airlCountrycol.setCellValueFactory(new PropertyValueFactory<Airline, String>("Country"));
diff --git a/src/main/java/seng202/group9/GUI/RouteRDController.java b/src/main/java/seng202/group9/GUI/RouteRDController.java
index e9ceaf8..7984304 100644
--- a/src/main/java/seng202/group9/GUI/RouteRDController.java
+++ b/src/main/java/seng202/group9/GUI/RouteRDController.java
@@ -9,7 +9,6 @@ import javafx.scene.control.TextField;
 import javafx.scene.control.cell.PropertyValueFactory;
 import seng202.group9.Controller.App;
 import seng202.group9.Controller.Dataset;
-import seng202.group9.Core.Airline;
 import seng202.group9.Core.Route;
 
 /**
diff --git a/src/main/resources/airline_raw_data.fxml b/src/main/resources/airline_raw_data.fxml
index 3b55509..cd8311d 100644
--- a/src/main/resources/airline_raw_data.fxml
+++ b/src/main/resources/airline_raw_data.fxml
@@ -10,10 +10,9 @@
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.shape.Rectangle?>
 <?import javafx.scene.text.Font?>
 
-<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.AirlineRDController">
+<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="568.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.AirlineRDController">
   <columnConstraints>
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
@@ -23,18 +22,18 @@
     <RowConstraints maxHeight="129.0" minHeight="10.0" prefHeight="111.0" vgrow="SOMETIMES" />
   </rowConstraints>
    <children>
-      <Pane prefHeight="410.0" prefWidth="800.0" GridPane.columnSpan="2">
+      <Pane prefHeight="600.0" prefWidth="800.0" GridPane.columnSpan="2" GridPane.rowSpan="2">
          <children>
             <Label layoutX="14.0" layoutY="14.0" text="Airline Raw Data">
                <font>
                   <Font size="29.0" />
                </font>
             </Label>
-            <Button layoutX="14.0" layoutY="412.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="125.0" text="Analyse" />
-            <Button layoutX="654.0" layoutY="412.0" mnemonicParsing="false" onAction="#addAirlineSingle" prefHeight="25.0" prefWidth="125.0" text="Add" />
-            <Pane layoutX="14.0" layoutY="57.0" prefHeight="300.0" prefWidth="765.0">
+            <Button layoutX="14.0" layoutY="526.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="125.0" text="Analyse" />
+            <Button layoutX="654.0" layoutY="526.0" mnemonicParsing="false" onAction="#addAirlineSingle" prefHeight="25.0" prefWidth="125.0" text="Add" />
+            <Pane layoutX="14.0" layoutY="57.0" prefHeight="403.0" prefWidth="765.0">
                <children>
-                  <TableView fx:id="tableView" layoutX="1.0" prefHeight="300.0" prefWidth="765.0">
+                  <TableView fx:id="tableView" layoutX="1.0" prefHeight="403.0" prefWidth="765.0">
                     <columns>
                       <TableColumn fx:id="airlIDcol" prefWidth="83.0" text="Airline ID" />
                       <TableColumn fx:id="airlNamecol" prefWidth="137.0" text="Name" />
@@ -48,7 +47,7 @@
                   </TableView>
                </children>
             </Pane>
-            <Pane layoutX="14.0" layoutY="365.0" prefHeight="31.0" prefWidth="765.0">
+            <Pane layoutX="14.0" layoutY="483.0" prefHeight="31.0" prefWidth="765.0">
                <children>
                   <TextField fx:id="airlNameBox" layoutX="97.0" layoutY="2.0" prefHeight="25.0" prefWidth="137.0" promptText="Name">
                      <padding>
@@ -90,10 +89,5 @@
             </Pane>
          </children>
       </Pane>
-      <Pane prefHeight="142.0" prefWidth="202.0" GridPane.columnSpan="2" GridPane.rowIndex="1" GridPane.rowSpan="2147483647">
-         <children>
-            <Rectangle arcHeight="5.0" arcWidth="5.0" fill="#ec1fff35" height="142.0" stroke="BLACK" strokeType="INSIDE" width="800.0" />
-         </children>
-      </Pane>
    </children>
 </GridPane>
diff --git a/src/main/resources/airport_raw_data.fxml b/src/main/resources/airport_raw_data.fxml
index 7bf6680..372ae3b 100644
--- a/src/main/resources/airport_raw_data.fxml
+++ b/src/main/resources/airport_raw_data.fxml
@@ -11,10 +11,9 @@
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.shape.Rectangle?>
 <?import javafx.scene.text.Font?>
 
-<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.AirportRDController">
+<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="568.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.AirportRDController">
   <columnConstraints>
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
@@ -24,14 +23,14 @@
     <RowConstraints maxHeight="129.0" minHeight="10.0" prefHeight="111.0" vgrow="SOMETIMES" />
   </rowConstraints>
    <children>
-      <Pane prefHeight="141.0" prefWidth="600.0" GridPane.columnSpan="2">
+      <Pane prefHeight="600.0" prefWidth="800.0" GridPane.columnSpan="2" GridPane.rowSpan="2">
          <children>
             <Label layoutX="14.0" layoutY="14.0" text="Airport Raw Data">
                <font>
                   <Font size="29.0" />
                </font>
             </Label>
-            <ScrollPane hbarPolicy="ALWAYS" layoutX="14.0" layoutY="369.0" prefHeight="47.0" prefViewportHeight="29.0" prefViewportWidth="1095.0" prefWidth="772.0" vbarPolicy="NEVER">
+            <ScrollPane hbarPolicy="ALWAYS" layoutX="14.0" layoutY="474.0" prefHeight="47.0" prefViewportHeight="29.0" prefViewportWidth="1095.0" prefWidth="772.0" vbarPolicy="NEVER">
                <content>
                   <Pane prefHeight="29.0" prefWidth="1219.0">
                      <children>
@@ -95,11 +94,11 @@
                   </Pane>
                </content>
             </ScrollPane>
-            <Button layoutX="15.0" layoutY="420.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="125.0" text="Analyse" />
-            <Button layoutX="662.0" layoutY="420.0" mnemonicParsing="false" onAction="#addAirportSingle" prefHeight="25.0" prefWidth="125.0" text="Add" />
-            <Pane layoutX="15.0" layoutY="60.0" prefHeight="295.0" prefWidth="772.0">
+            <Button layoutX="14.0" layoutY="526.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="125.0" text="Analyse" />
+            <Button layoutX="662.0" layoutY="526.0" mnemonicParsing="false" onAction="#addAirportSingle" prefHeight="25.0" prefWidth="125.0" text="Add" />
+            <Pane layoutX="15.0" layoutY="60.0" prefHeight="403.0" prefWidth="772.0">
                <children>
-                  <TableView fx:id="tableViewAirportRD" prefHeight="300.0" prefWidth="772.0">
+                  <TableView fx:id="tableViewAirportRD" prefHeight="403.0" prefWidth="772.0">
                     <columns>
                       <TableColumn fx:id="airpIDcol" prefWidth="83.0" text="Airport ID" />
                       <TableColumn fx:id="airpNamecol" prefWidth="137.0" text="Name" />
@@ -118,10 +117,5 @@
                </children></Pane>
          </children>
       </Pane>
-      <Pane prefHeight="137.0" prefWidth="800.0" GridPane.columnSpan="2" GridPane.rowIndex="1" GridPane.rowSpan="2147483647">
-         <children>
-            <Rectangle arcHeight="5.0" arcWidth="5.0" fill="#ec1fff35" height="142.0" layoutY="1.0" stroke="BLACK" strokeType="INSIDE" width="800.0" />
-         </children>
-      </Pane>
    </children>
 </GridPane>
diff --git a/src/main/resources/route_raw_data.fxml b/src/main/resources/route_raw_data.fxml
index 67fe805..870dddb 100644
--- a/src/main/resources/route_raw_data.fxml
+++ b/src/main/resources/route_raw_data.fxml
@@ -3,7 +3,6 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.control.TableColumn?>
 <?import javafx.scene.control.TableView?>
 <?import javafx.scene.control.TextField?>
@@ -11,84 +10,30 @@
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.shape.Rectangle?>
 <?import javafx.scene.text.Font?>
 
-<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.RouteRDController">
+<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="568.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.RouteRDController">
   <columnConstraints>
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
   </columnConstraints>
   <rowConstraints>
     <RowConstraints maxHeight="457.0" minHeight="10.0" prefHeight="403.0" vgrow="SOMETIMES" />
-    <RowConstraints maxHeight="129.0" minHeight="10.0" prefHeight="111.0" vgrow="SOMETIMES" />
+      <RowConstraints maxHeight="457.0" minHeight="10.0" prefHeight="403.0" vgrow="SOMETIMES" />
   </rowConstraints>
    <children>
-      <Pane prefHeight="141.0" prefWidth="306.0" GridPane.columnSpan="2">
+      <Pane prefHeight="510.0" prefWidth="800.0" GridPane.columnSpan="2" GridPane.rowSpan="2">
          <children>
             <Label layoutX="14.0" layoutY="14.0" text="Route Raw Data">
                <font>
                   <Font size="29.0" />
                </font>
             </Label>
-            <ScrollPane hbarPolicy="ALWAYS" layoutX="15.0" layoutY="364.0" prefHeight="47.0" prefViewportHeight="29.0" prefViewportWidth="1095.0" prefWidth="765.0" vbarPolicy="NEVER">
-               <content>
-                  <Pane prefHeight="49.0" prefWidth="1021.0">
-                     <children>
-                        <TextField fx:id="rAirlineBox" layoutX="6.0" layoutY="2.0" prefHeight="25.0" prefWidth="60.0" promptText="Airline">
-                           <padding>
-                              <Insets left="2.0" right="2.0" />
-                           </padding>
-                        </TextField>
-                        <TextField fx:id="rAirlineIDBox" layoutX="66.0" layoutY="2.0" prefHeight="25.0" prefWidth="85.0" promptText="Airline ID">
-                           <padding>
-                              <Insets left="2.0" right="2.0" />
-                           </padding>
-                        </TextField>
-                        <TextField fx:id="rSourceBox" layoutX="151.0" layoutY="2.0" prefHeight="25.0" prefWidth="125.0" promptText="Source airport">
-                           <padding>
-                              <Insets left="2.0" right="2.0" />
-                           </padding>
-                        </TextField>
-                        <TextField fx:id="rSourceIDBox" layoutX="276.0" layoutY="2.0" prefHeight="25.0" prefWidth="142.0" promptText="Source airport ID">
-                           <padding>
-                              <Insets left="2.0" right="2.0" />
-                           </padding>
-                        </TextField>
-                        <TextField fx:id="rDestBox" layoutX="418.0" layoutY="2.0" prefHeight="25.0" prefWidth="154.0" promptText="Destination airport">
-                           <padding>
-                              <Insets left="2.0" right="2.0" />
-                           </padding>
-                        </TextField>
-                        <TextField fx:id="rDestIDBox" layoutX="572.0" layoutY="2.0" prefHeight="25.0" prefWidth="187.0" promptText="Destination airport ID">
-                           <padding>
-                              <Insets left="2.0" right="2.0" />
-                           </padding>
-                        </TextField>
-                        <TextField fx:id="rCodeshareBox" layoutX="758.0" layoutY="2.0" prefHeight="25.0" prefWidth="99.0" promptText="Codeshare">
-                           <padding>
-                              <Insets left="2.0" right="2.0" />
-                           </padding>
-                        </TextField>
-                        <TextField fx:id="rStopsBox" layoutX="857.0" layoutY="2.0" prefHeight="25.0" prefWidth="65.0" promptText="Stops">
-                           <padding>
-                              <Insets left="2.0" right="2.0" />
-                           </padding>
-                        </TextField>
-                        <TextField fx:id="rEquipmentBox" layoutX="922.0" layoutY="2.0" prefHeight="25.0" prefWidth="98.0" promptText="Equipment">
-                           <padding>
-                              <Insets left="2.0" right="2.0" />
-                           </padding>
-                        </TextField>
-                     </children>
-                  </Pane>
-               </content>
-            </ScrollPane>
-            <Button layoutX="16.0" layoutY="420.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="125.0" text="Analyse" />
-            <Button layoutX="655.0" layoutY="420.0" mnemonicParsing="false" onAction="#addRouteSingle" prefHeight="25.0" prefWidth="125.0" text="Add" />
-            <Pane layoutX="16.0" layoutY="53.0" prefHeight="300.0" prefWidth="765.0">
+            <Button layoutX="14.0" layoutY="524.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="125.0" text="Analyse" />
+            <Button layoutX="656.0" layoutY="524.0" mnemonicParsing="false" onAction="#addRouteSingle" prefHeight="25.0" prefWidth="125.0" text="Add" />
+            <Pane layoutX="16.0" layoutY="53.0" prefHeight="403.0" prefWidth="765.0">
                <children>
-                  <TableView fx:id="tableViewRouteRD" layoutX="-1.0" prefHeight="300.0" prefWidth="765.0">
+                  <TableView fx:id="tableViewRouteRD" layoutX="-1.0" prefHeight="403.0" prefWidth="765.0">
                     <columns>
                       <TableColumn fx:id="rAirlineCol" prefWidth="67.0" text="Airline" />
                       <TableColumn fx:id="rAirlineIDCol" prefWidth="86.0" text="Airline ID" />
@@ -103,11 +48,41 @@
                   </TableView>
                </children>
             </Pane>
-         </children>
-      </Pane>
-      <Pane prefHeight="142.0" prefWidth="800.0" GridPane.columnSpan="2" GridPane.rowIndex="1" GridPane.rowSpan="2147483647">
-         <children>
-            <Rectangle arcHeight="5.0" arcWidth="5.0" fill="#ec1fff35" height="142.0" layoutY="1.0" stroke="BLACK" strokeType="INSIDE" width="800.0" />
+            <Pane layoutX="16.0" layoutY="479.0" prefHeight="32.0" prefWidth="765.0">
+               <children>
+                  <TextField fx:id="rAirlineBox" layoutX="90.0" layoutY="2.0" prefHeight="25.0" prefWidth="100.0" promptText="Airline">
+                     <padding>
+                        <Insets left="2.0" right="2.0" />
+                     </padding>
+                  </TextField>
+                  <TextField fx:id="rSourceBox" layoutX="190.0" layoutY="2.0" prefHeight="25.0" prefWidth="150.0" promptText="Source airport">
+                     <padding>
+                        <Insets left="2.0" right="2.0" />
+                     </padding>
+                  </TextField>
+                  <TextField fx:id="rDestBox" layoutX="340.0" layoutY="2.0" prefHeight="25.0" prefWidth="150.0" promptText="Destination airport">
+                     <padding>
+                        <Insets left="2.0" right="2.0" />
+                     </padding>
+                  </TextField>
+                  <TextField fx:id="rCodeshareBox" layoutX="490.0" layoutY="2.0" prefHeight="25.0" prefWidth="100.0" promptText="Codeshare">
+                     <padding>
+                        <Insets left="2.0" right="2.0" />
+                     </padding>
+                  </TextField>
+                  <TextField fx:id="rStopsBox" layoutX="590.0" layoutY="2.0" prefHeight="25.0" prefWidth="75.0" promptText="Stops">
+                     <padding>
+                        <Insets left="2.0" right="2.0" />
+                     </padding>
+                  </TextField>
+                  <TextField fx:id="rEquipmentBox" layoutX="665.0" layoutY="2.0" prefHeight="25.0" prefWidth="100.0" promptText="Equipment">
+                     <padding>
+                        <Insets left="2.0" right="2.0" />
+                     </padding>
+                  </TextField>
+                  <Label layoutY="4.0" text="Enter Values:" />
+               </children>
+            </Pane>
          </children>
       </Pane>
    </children>