diff --git a/res/userdb.db b/res/userdb.db
index 2cdbf70..5345ffa 100644
Binary files a/res/userdb.db and b/res/userdb.db differ
diff --git a/src/main/resources/airline_summary.fxml b/src/main/resources/airline_summary.fxml
index 2b852ba..7d7d55e 100644
--- a/src/main/resources/airline_summary.fxml
+++ b/src/main/resources/airline_summary.fxml
@@ -1,100 +1,94 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.shape.*?>
-<?import javafx.scene.text.*?>
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ListView?>
-<?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.control.TextArea?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Pane?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.shape.Rectangle?>
-<?import javafx.scene.text.Font?>
-<?import javafx.scene.text.Text?>
+        <?import javafx.geometry.Insets?>
+        <?import javafx.scene.control.Button?>
+        <?import javafx.scene.control.ScrollPane?>
+        <?import javafx.scene.control.TableColumn?>
+        <?import javafx.scene.control.TableView?>
+        <?import javafx.scene.layout.AnchorPane?>
+        <?import javafx.scene.layout.HBox?>
+        <?import javafx.scene.layout.Pane?>
+        <?import javafx.scene.layout.VBox?>
+        <?import javafx.scene.shape.Rectangle?>
+        <?import javafx.scene.text.Font?>
+        <?import javafx.scene.text.Text?>
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.FlightSummaryController">
-   <children>
-      <ScrollPane prefHeight="800.0" prefWidth="800.0">
-         <content>
-            <AnchorPane prefHeight="800.0" prefWidth="800.0">
-               <children>
-                  <HBox alignment="CENTER" prefHeight="300.0" prefWidth="583.0" AnchorPane.topAnchor="25.0">
-                     <children>
-                        <AnchorPane prefHeight="300.0" prefWidth="330.0">
-                           <children>
-                              <Pane layoutY="-6.0" prefHeight="60.0" prefWidth="330.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                                 <children>
-                                    <Text layoutX="21.0" layoutY="40.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Airlines Summary">
-                                       <font>
-                                          <Font size="29.0" />
-                                       </font>
-                                    </Text>
-                                 </children>
-                              </Pane>
-                              <Pane layoutY="52.0" prefHeight="240.0" prefWidth="480.0" AnchorPane.bottomAnchor="0.0">
-                                 <children>
-                                    <Pane layoutX="25.0" layoutY="10.0" prefHeight="220.0" prefWidth="120.0" />
-                                    <TableView layoutX="10.0" layoutY="10.0" prefHeight="200.0" prefWidth="378.0">
-                                       <columns>
-                                          <TableColumn fx:id="namesColumn" prefWidth="75.0" text="Name" />
-                                          <TableColumn prefWidth="75.0" text="City" />
-                                          <TableColumn prefWidth="75.0" text="Country" />
-                                          <TableColumn prefWidth="75.0" text="Altitude" />
-                                          <TableColumn prefWidth="75.0" text="IATA/FAA" />
-                                       </columns>
-                                    </TableView>
-                                 </children>
-                                 <padding>
-                                    <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-                                 </padding>
-                              </Pane>
-                           </children>
-                        </AnchorPane>
-                        <AnchorPane prefHeight="300.0" prefWidth="253.0">
-                           <children>
-                              <Pane layoutY="200.0" prefHeight="100.0" prefWidth="253.0">
-                                 <children>
-                                    <Button fx:id="toAirportSummary" layoutX="20.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Airports">
-                                       <font>
-                                          <Font size="12.0" />
-                                       </font>
-                                    </Button>
-                                    <Button fx:id="toRouteSummary" layoutX="94.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Routes">
-                                       <font>
-                                          <Font size="12.0" />
-                                       </font>
-                                    </Button>
-                                    <Button fx:id="toFlightSummary" layoutX="169.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Flights">
-                                       <font>
-                                          <Font size="12.0" />
-                                       </font>
-                                    </Button>
-                                    <Button fx:id="toAirlineRawData" layoutX="20.0" layoutY="61.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="214.0" text="Airline Raw Data" />
-                                 </children>
-                                 <padding>
-                                    <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-                                 </padding>
-                              </Pane>
-                              <Pane prefHeight="200.0" prefWidth="253.0">
-                                 <padding>
-                                    <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-                                 </padding>
-                              </Pane>
-                              <Rectangle arcHeight="5.0" arcWidth="5.0" fill="DODGERBLUE" height="200.0" stroke="BLACK" strokeType="INSIDE" width="252.0" />
-                           </children>
-                        </AnchorPane>
-                     </children>
-                  </HBox>
-               </children>
-            </AnchorPane>
-         </content>
-      </ScrollPane>
-   </children>
-</VBox>
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.45" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.AirlineSummaryController">
+<children>
+   <ScrollPane prefHeight="800.0" prefWidth="800.0">
+      <content>
+         <AnchorPane prefHeight="800.0" prefWidth="800.0">
+            <children>
+               <HBox alignment="CENTER" prefHeight="300.0" prefWidth="583.0" AnchorPane.topAnchor="25.0">
+                  <children>
+                     <AnchorPane prefHeight="300.0" prefWidth="330.0">
+                        <children>
+                           <Pane layoutY="-6.0" prefHeight="60.0" prefWidth="330.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                              <children>
+                                 <Text layoutX="21.0" layoutY="40.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Airlines Summary">
+                                    <font>
+                                       <Font size="29.0" />
+                                    </font>
+                                 </Text>
+                              </children>
+                           </Pane>
+                           <Pane layoutY="52.0" prefHeight="240.0" prefWidth="480.0" AnchorPane.bottomAnchor="0.0">
+                              <children>
+                                 <Pane layoutX="25.0" layoutY="10.0" prefHeight="220.0" prefWidth="120.0" />
+                                 <TableView fx:id="tableView" layoutX="10.0" layoutY="10.0" prefHeight="200.0" prefWidth="378.0">
+                                    <columns>
+                                       <TableColumn fx:id="columnName" text="Name" />
+                                       <TableColumn fx:id="columnAlias" prefWidth="77.0" text="Alias" />
+                                       <TableColumn fx:id="columnCountry" prefWidth="86.0" text="Country" />
+                                       <TableColumn fx:id="columnIATA" prefWidth="86.0" text="IATA/FAA" />
+                                       <TableColumn fx:id="columnActive" prefWidth="46.0" text="Active" />
+                                    </columns>
+                                 </TableView>
+                              </children>
+                              <padding>
+                                 <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                              </padding>
+                           </Pane>
+                        </children>
+                     </AnchorPane>
+                     <AnchorPane prefHeight="300.0" prefWidth="253.0">
+                        <children>
+                           <Pane layoutY="200.0" prefHeight="100.0" prefWidth="253.0">
+                              <children>
+                                 <Button layoutX="20.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Airports">
+                                    <font>
+                                       <Font size="12.0" />
+                                    </font>
+                                 </Button>
+                                 <Button layoutX="94.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Routes">
+                                    <font>
+                                       <Font size="12.0" />
+                                    </font>
+                                 </Button>
+                                 <Button layoutX="169.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Flights">
+                                    <font>
+                                       <Font size="12.0" />
+                                    </font>
+                                 </Button>
+                                 <Button layoutX="20.0" layoutY="61.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="214.0" text="Airline Raw Data" />
+                              </children>
+                              <padding>
+                                 <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                              </padding>
+                           </Pane>
+                           <Pane prefHeight="200.0" prefWidth="253.0">
+                              <padding>
+                                 <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                              </padding>
+                           </Pane>
+                           <Rectangle arcHeight="5.0" arcWidth="5.0" fill="DODGERBLUE" height="200.0" stroke="BLACK" strokeType="INSIDE" width="252.0" />
+                        </children>
+                     </AnchorPane>
+                  </children>
+               </HBox>
+            </children>
+         </AnchorPane>
+      </content>
+   </ScrollPane>
+</children>
+</VBox>
\ No newline at end of file
diff --git a/src/main/resources/airport_summary.fxml b/src/main/resources/airport_summary.fxml
index f4580c9..31e8e75 100644
--- a/src/main/resources/airport_summary.fxml
+++ b/src/main/resources/airport_summary.fxml
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.shape.*?>
-<?import javafx.scene.text.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ListView?>
 <?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Pane?>
@@ -19,7 +13,7 @@
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.FlightSummaryController">
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.45" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.AirportSummaryController">
    <children>
       <ScrollPane prefHeight="800.0" prefWidth="800.0">
          <content>
@@ -42,13 +36,13 @@
                                  <children>
                                     <Pane layoutX="25.0" layoutY="10.0" prefHeight="220.0" prefWidth="120.0">
                                        <children>
-                                          <TableView layoutX="10.0" layoutY="10.0" prefHeight="200.0" prefWidth="378.0">
+                                          <TableView fx:id="tableView" layoutX="10.0" layoutY="10.0" prefHeight="200.0" prefWidth="378.0">
                                              <columns>
-                                                <TableColumn fx:id="namesColumn" prefWidth="75.0" text="Name" />
-                                                <TableColumn prefWidth="75.0" text="City" />
-                                                <TableColumn prefWidth="75.0" text="Country" />
-                                                <TableColumn prefWidth="75.0" text="Altitude" />
-                                                <TableColumn prefWidth="75.0" text="IATA/FAA" />
+                                                <TableColumn fx:id="columnName" prefWidth="75.0" text="Name" />
+                                                <TableColumn fx:id="columnCity" prefWidth="75.0" text="City" />
+                                                <TableColumn fx:id="columnCountry" prefWidth="75.0" text="Country" />
+                                                <TableColumn fx:id="columnAltitude" prefWidth="75.0" text="Altitude" />
+                                                <TableColumn fx:id="columnIATA" prefWidth="75.0" text="IATA/FAA" />
                                              </columns>
                                           </TableView>
                                        </children>
@@ -64,22 +58,22 @@
                            <children>
                               <Pane layoutY="200.0" prefHeight="100.0" prefWidth="253.0">
                                  <children>
-                                    <Button fx:id="toRoutesSumary" layoutX="20.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Routes">
+                                    <Button layoutX="20.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Routes">
                                        <font>
                                           <Font size="12.0" />
                                        </font>
                                     </Button>
-                                    <Button fx:id="toAirlineSummary" layoutX="94.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Airlines">
+                                    <Button layoutX="94.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Airlines">
                                        <font>
                                           <Font size="12.0" />
                                        </font>
                                     </Button>
-                                    <Button fx:id="toFlightSummary" layoutX="169.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Flights">
+                                    <Button layoutX="169.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Flights">
                                        <font>
                                           <Font size="12.0" />
                                        </font>
                                     </Button>
-                                    <Button fx:id="toAiportRawData" layoutX="20.0" layoutY="61.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="214.0" text="Airport Raw Data" />
+                                    <Button layoutX="20.0" layoutY="61.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="214.0" text="Airport Raw Data" />
                                  </children>
                                  <padding>
                                     <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
@@ -100,4 +94,4 @@
          </content>
       </ScrollPane>
    </children>
-</VBox>
+</VBox>
\ No newline at end of file
diff --git a/src/main/resources/routes_summary.fxml b/src/main/resources/routes_summary.fxml
index b376716..efd6553 100644
--- a/src/main/resources/routes_summary.fxml
+++ b/src/main/resources/routes_summary.fxml
@@ -37,13 +37,13 @@
                                     <Pane layoutX="25.0" layoutY="10.0" prefHeight="220.0" prefWidth="120.0">
                                        <children>
                                           <TableView fx:id="tableView" prefHeight="200.0" prefWidth="378.0">
-                                            <columns>
-                                              <TableColumn fx:id="columnAirline" prefWidth="75.0" text="Airline" />
-                                              <TableColumn fx:id="columnDepart" prefWidth="75.0" text="Depart" />
-                                               <TableColumn fx:id="columnArrive" prefWidth="75.0" text="Arrive" />
-                                               <TableColumn fx:id="columnStops" prefWidth="75.0" text="Stops" />
-                                               <TableColumn fx:id="columnEquipment" prefWidth="75.0" text="Equipment" />
-                                            </columns>
+                                             <columns>
+                                                <TableColumn fx:id="columnAirline" prefWidth="75.0" text="Airline" />
+                                                <TableColumn fx:id="columnDepart" prefWidth="75.0" text="Depart" />
+                                                <TableColumn fx:id="columnArrive" prefWidth="75.0" text="Arrive" />
+                                                <TableColumn fx:id="columnStops" prefWidth="75.0" text="Stops" />
+                                                <TableColumn fx:id="columnEquipment" prefWidth="75.0" text="Equipment" />
+                                             </columns>
                                           </TableView>
                                        </children>
                                     </Pane>
@@ -58,22 +58,22 @@
                            <children>
                               <Pane layoutY="200.0" prefHeight="100.0" prefWidth="253.0">
                                  <children>
-                                    <Button fx:id="toAirports" layoutX="20.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Airports">
+                                    <Button layoutX="20.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Airports">
                                        <font>
                                           <Font size="12.0" />
                                        </font>
                                     </Button>
-                                    <Button fx:id="toAirlines" layoutX="94.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Airlines">
+                                    <Button layoutX="94.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Airlines">
                                        <font>
                                           <Font size="12.0" />
                                        </font>
                                     </Button>
-                                    <Button fx:id="toFlights" layoutX="169.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Flights">
+                                    <Button layoutX="169.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Flights">
                                        <font>
                                           <Font size="12.0" />
                                        </font>
                                     </Button>
-                                    <Button fx:id="toRawRoute" layoutX="20.0" layoutY="61.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="214.0" text="Routes Raw Data" />
+                                    <Button layoutX="20.0" layoutY="61.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="214.0" text="Routes Raw Data" />
                                  </children>
                                  <padding>
                                     <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
@@ -94,4 +94,4 @@
          </content>
       </ScrollPane>
    </children>
-</VBox>
+</VBox>
\ No newline at end of file