diff --git a/src/main/java/seng202/group9/Controller/AirlineParser.java b/src/main/java/seng202/group9/Controller/AirlineParser.java
index 9f2b8a0..4a354b9 100644
--- a/src/main/java/seng202/group9/Controller/AirlineParser.java
+++ b/src/main/java/seng202/group9/Controller/AirlineParser.java
@@ -1,5 +1,7 @@
 package seng202.group9.Controller;
 
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import seng202.group9.Core.Airline;
 
 import java.io.*;
diff --git a/src/main/java/seng202/group9/Controller/AirportParser.java b/src/main/java/seng202/group9/Controller/AirportParser.java
index 3598adf..04c1b15 100644
--- a/src/main/java/seng202/group9/Controller/AirportParser.java
+++ b/src/main/java/seng202/group9/Controller/AirportParser.java
@@ -1,10 +1,14 @@
 package seng202.group9.Controller;
 
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import seng202.group9.Core.Airport;
 import seng202.group9.Core.City;
 import seng202.group9.Core.Country;
 
+import javax.jws.Oneway;
 import java.io.*;
+import java.lang.reflect.Array;
 import java.util.ArrayList;
 
 public class AirportParser extends Parser {
diff --git a/src/main/java/seng202/group9/Controller/App.java b/src/main/java/seng202/group9/Controller/App.java
index 94ca7b5..bfc2abf 100644
--- a/src/main/java/seng202/group9/Controller/App.java
+++ b/src/main/java/seng202/group9/Controller/App.java
@@ -54,11 +54,15 @@ public class App extends Application
 			e.printStackTrace();
 		}
 		primaryStage.show();
+
 		//testing out dataset
 		try {
 			currentDataset = new Dataset("test's", Dataset.getExisting);
 		}catch (DataException e){
 			e.printStackTrace();
+
+		}/*
+
 		}
 		//testout single airport adding
 		try {
@@ -74,6 +78,7 @@ public class App extends Application
 			e.printStackTrace();
 		}
 
+
 		//testing out airport parser
 		try {
 			System.out.println(currentDataset.importAirport("res/Samples/Airports.txt"));
diff --git a/src/main/java/seng202/group9/Controller/Dataset.java b/src/main/java/seng202/group9/Controller/Dataset.java
index 0072e78..3db650e 100644
--- a/src/main/java/seng202/group9/Controller/Dataset.java
+++ b/src/main/java/seng202/group9/Controller/Dataset.java
@@ -1,6 +1,8 @@
 package seng202.group9.Controller;
 
 
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import seng202.group9.Core.*;
 
 import java.sql.Connection;
@@ -13,7 +15,7 @@ import java.util.LinkedHashMap;
 public class Dataset {
 
     String name;
-    static boolean getExisting = true;//constructor variables for action
+    public static boolean getExisting = true;//constructor variables for action
     static boolean createNew = false;//constructor variables for action
     ArrayList<Airline> airlines;
     ArrayList<Airport> airports;
diff --git a/src/main/java/seng202/group9/Core/Airport.java b/src/main/java/seng202/group9/Core/Airport.java
index 8283933..7106916 100644
--- a/src/main/java/seng202/group9/Core/Airport.java
+++ b/src/main/java/seng202/group9/Core/Airport.java
@@ -195,9 +195,9 @@ public class Airport {
 	 * gets the IATA/FFA of the airport
 	 * @return IATA/FFA Code
 	 */
-	public String IATA_FFA(){
-		return IATA_FFA;
-	}
+//	public String IATA_FFA(){
+//		return IATA_FFA;
+//	}
 	/**
 	 * gets the altitude of the airport
 	 * @return Altitude of Airport
@@ -318,6 +318,7 @@ public class Airport {
 	/**
 	 * Information of the airport returned in String format.
 	 */
+
 	@Override
 	public String toString(){
 		return this.city+" Airport has ICAO: "+this.ICAO+", IATA/FFA: "+this.IATA_FFA+" and is located at ("+this.latitude+", "+this.longitude
diff --git a/src/main/java/seng202/group9/GUI/AirlineRDController.java b/src/main/java/seng202/group9/GUI/AirlineRDController.java
new file mode 100644
index 0000000..84a3913
--- /dev/null
+++ b/src/main/java/seng202/group9/GUI/AirlineRDController.java
@@ -0,0 +1,102 @@
+package seng202.group9.GUI;
+
+import javafx.collections.FXCollections;
+import javafx.fxml.FXML;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
+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;
+
+/**
+ * Created by Sunguin on 2016/09/13.
+ */
+public class AirlineRDController extends MenuController {
+
+    @FXML
+    private TableView<Airline> tableView;
+    @FXML
+    private TableColumn<Airline, String> airlIDcol;
+    @FXML
+    private TableColumn<Airline, String> airlNamecol;
+    @FXML
+    private TableColumn<Airline, String> airlAliascol;
+    @FXML
+    private TableColumn<Airline, String> airlIATAcol;
+    @FXML
+    private TableColumn<Airline, String> airlICAOcol;
+    @FXML
+    private TableColumn<Airline, String> airlCallsigncol;
+    @FXML
+    private TableColumn<Airline, String> airlCountrycol;
+    @FXML
+    private TableColumn<Airline, String> airlActivecol;
+    @FXML
+    private TextField airlNameBox;
+    @FXML
+    private TextField airlAliasBox;
+    @FXML
+    private TextField airlIATABox;
+    @FXML
+    private TextField airlICAOBox;
+    @FXML
+    private TextField airlCallsignBox;
+    @FXML
+    private TextField airlCountryBox;
+    @FXML
+    private TextField airlActiveBox;
+    @FXML
+    private TextField airlIDBox;
+
+
+    private Dataset theDataSet = null;
+
+    App parent;
+
+    public void setApp(App parent){
+        this.parent = parent;
+    }
+
+    public void loadTables() {
+        airlIDcol.setCellValueFactory(new PropertyValueFactory<Airline, String>("ID"));
+        airlNamecol.setCellValueFactory(new PropertyValueFactory<Airline, String>("Name"));
+        airlAliascol.setCellValueFactory(new PropertyValueFactory<Airline, String>("Alias"));
+        airlIATAcol.setCellValueFactory(new PropertyValueFactory<Airline, String>("IATA"));
+        airlICAOcol.setCellValueFactory(new PropertyValueFactory<Airline, String>("ICAO"));
+        airlCallsigncol.setCellValueFactory(new PropertyValueFactory<Airline, String>("CallSign"));
+        airlCountrycol.setCellValueFactory(new PropertyValueFactory<Airline, String>("Country"));
+        airlActivecol.setCellValueFactory(new PropertyValueFactory<Airline, String>("Active"));
+
+        theDataSet = this.parent.getCurrentDataset();
+//        try{
+//            System.out.println(theDataSet.importAirline("res/Samples/Airlines.txt"));
+//        } catch (DataException e){
+//            e.printStackTrace();
+//        }
+        tableView.setItems(FXCollections.observableArrayList(theDataSet.getAirlines()));
+    }
+
+    //Dummy function to test the add button.
+    //Will edit when ID is added automatically.
+    public void addAirlineSingle() {
+        theDataSet.getAirlines().add(new Airline(
+                Integer.parseInt(airlIDBox.getText()),
+                airlNameBox.getText(),
+                airlAliasBox.getText(),
+                airlIATABox.getText(),
+                airlICAOBox.getText(),
+                airlCallsignBox.getText(),
+                airlCountryBox.getText(),
+                airlActiveBox.getText()));
+        airlIDBox.clear();
+        airlNameBox.clear();
+        airlAliasBox.clear();
+        airlIATABox.clear();
+        airlICAOBox.clear();
+        airlCallsignBox.clear();
+        airlCountryBox.clear();
+        airlActiveBox.clear();
+    }
+}
diff --git a/src/main/java/seng202/group9/GUI/AirportRDController.java b/src/main/java/seng202/group9/GUI/AirportRDController.java
new file mode 100644
index 0000000..d65768e
--- /dev/null
+++ b/src/main/java/seng202/group9/GUI/AirportRDController.java
@@ -0,0 +1,98 @@
+package seng202.group9.GUI;
+
+import javafx.beans.InvalidationListener;
+import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.control.TableCell;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
+import javafx.scene.control.cell.PropertyValueFactory;
+import javafx.util.Callback;
+import seng202.group9.Controller.App;
+import seng202.group9.Controller.Dataset;
+import seng202.group9.Core.Airport;
+import seng202.group9.Core.City;
+import seng202.group9.Core.Country;
+
+
+/**
+ * Created by Sunguin on 2016/09/13.
+ */
+public class AirportRDController extends MenuController{
+
+    @FXML
+    private TableView<Airport> tableViewAirportRD;
+    @FXML
+    private TableColumn<Airport, String> airpIDcol;
+    @FXML
+    private TableColumn<Airport, String> airpNamecol;
+    @FXML
+    private TableColumn<Airport, String> airpCitycol;
+    @FXML
+    private TableColumn<Airport, String> airpCountrycol;
+    @FXML
+    private TableColumn<Airport, String> airpIATAFFAcol;
+    @FXML
+    private TableColumn<Airport, String> airpICAOcol;
+    @FXML
+    private TableColumn<Airport, String> airpLatitudecol;
+    @FXML
+    private TableColumn<Airport, String> airpLongitudecol;
+    @FXML
+    private TableColumn<Airport, String> airpAltitudecol;
+    @FXML
+    private TableColumn<Airport, City> airpTimezonecol;
+    @FXML
+    private TableColumn<Airport, Country> airpDSTcol;
+    @FXML
+    private TableColumn<Airport, City> airpTzcol;
+
+    private Dataset theDataSet = null;
+
+    App parent;
+
+    public void setApp(App parent){
+        this.parent = parent;
+    }
+
+    public void loadTables() {
+        theDataSet = this.parent.getCurrentDataset();
+
+        airpIDcol.setCellValueFactory(new PropertyValueFactory<Airport, String>("ID"));
+        airpNamecol.setCellValueFactory(new PropertyValueFactory<Airport, String>("Name"));
+        airpCitycol.setCellValueFactory(new PropertyValueFactory<Airport, String>("City"));
+        airpCountrycol.setCellValueFactory(new PropertyValueFactory<Airport, String>("Country"));
+        airpIATAFFAcol.setCellValueFactory(new PropertyValueFactory<Airport, String>("IATA_FFA"));
+        airpICAOcol.setCellValueFactory(new PropertyValueFactory<Airport, String>("ICAO"));
+        airpLatitudecol.setCellValueFactory(new PropertyValueFactory<Airport, String>("Latitude"));
+        airpLongitudecol.setCellValueFactory(new PropertyValueFactory<Airport, String>("Longitude"));
+        airpAltitudecol.setCellValueFactory(new PropertyValueFactory<Airport, String>("Altitude"));
+        airpTimezonecol.setCellValueFactory(new PropertyValueFactory<Airport, City>("Timezone"));
+        airpDSTcol.setCellValueFactory(new PropertyValueFactory<Airport, Country>("DST"));
+        airpTzcol.setCellValueFactory(new PropertyValueFactory<Airport, City>("Tz"));
+
+//        airpTimezonecol.setCellFactory(new Callback<TableColumn<Airport, String>, TableCell<Airport, City>>() {
+//
+//            @Override
+//            public TableCell<Airport, City> call(TableColumn<Airport, City> param) {
+//                TableCell<Airport, City> timeZoneCell = new TableCell<Airport, City>() {
+//                    @Override
+//                    protected void updateItem(City timezone, boolean empty) {
+//                        if (timezone != null) {
+//                            Label timeZoneLabel = new Label(timezone.getTimeOlson());
+//                            setGraphic(timeZoneLabel);
+//                        }
+//                    }
+//                };
+//
+//                return timeZoneCell;
+//            }
+//        });
+
+        tableViewAirportRD.setItems(FXCollections.observableArrayList(theDataSet.getAirports()));
+    }
+
+}
diff --git a/src/main/java/seng202/group9/GUI/MenuController.java b/src/main/java/seng202/group9/GUI/MenuController.java
index e03297b..f947e9f 100644
--- a/src/main/java/seng202/group9/GUI/MenuController.java
+++ b/src/main/java/seng202/group9/GUI/MenuController.java
@@ -37,8 +37,29 @@ public class MenuController implements Initializable{
 	 */
 	public void viewAirlineRawData() {
 		try {
-			parent.replaceSceneContent("menu.fxml");
-			System.out.println("Loaded Airline Raw Data.");
+            AirlineRDController summaryController = (AirlineRDController) parent.replaceSceneContent("airline_raw_data.fxml");
+            summaryController.setApp(parent);
+            summaryController.loadTables();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void viewAirportRawData() {
+		try {
+            AirportRDController summaryController = (AirportRDController) parent.replaceSceneContent("airport_raw_data.fxml");
+            summaryController.setApp(parent);
+            summaryController.loadTables();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void viewRouteRawData() {
+		try {
+			RouteRDController summaryController = (RouteRDController) parent.replaceSceneContent("route_raw_data.fxml");
+			summaryController.setApp(parent);
+			//summaryController.loadTables();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -74,6 +95,7 @@ public class MenuController implements Initializable{
 	}
 
 
+
 	public void initialize(URL arg0, ResourceBundle arg1) {
 		// TODO Auto-generated method stub
 		
diff --git a/src/main/java/seng202/group9/GUI/RouteRDController.java b/src/main/java/seng202/group9/GUI/RouteRDController.java
new file mode 100644
index 0000000..1475062
--- /dev/null
+++ b/src/main/java/seng202/group9/GUI/RouteRDController.java
@@ -0,0 +1,14 @@
+package seng202.group9.GUI;
+
+import seng202.group9.Controller.App;
+
+/**
+ * Created by Sunguin on 2016/09/14.
+ */
+public class RouteRDController extends MenuController {
+    App parent;
+
+    public void setApp(App parent){
+        this.parent = parent;
+    }
+}
diff --git a/src/main/resources/airline_raw_data.fxml b/src/main/resources/airline_raw_data.fxml
index a3937a7..7a259b3 100644
--- a/src/main/resources/airline_raw_data.fxml
+++ b/src/main/resources/airline_raw_data.fxml
@@ -1,127 +1,102 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.shape.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.text.*?>
-<?import javafx.scene.control.*?>
-<?import java.lang.*?>
-<?import javafx.scene.layout.*?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?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="533.0" prefWidth="600.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8">
+<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">
   <columnConstraints>
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
   </columnConstraints>
   <rowConstraints>
-    <RowConstraints maxHeight="125.0" minHeight="0.0" prefHeight="9.0" vgrow="SOMETIMES" />
     <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>
    <children>
-      <MenuBar GridPane.columnSpan="2">
-         <menus>
-            <Menu mnemonicParsing="false" text="File">
-               <items>
-                  <MenuItem mnemonicParsing="false" onAction="#importAirports" text="Import Airports" />
-                  <MenuItem mnemonicParsing="false" onAction="#importAirlines" text="Import Airlines" />
-                  <MenuItem mnemonicParsing="false" onAction="#importRoutes" text="Import Routes" />
-                  <MenuItem mnemonicParsing="false" onAction="#importFlightData" text="Import Flight Data" />
-                  <SeparatorMenuItem mnemonicParsing="false" />
-                  <MenuItem mnemonicParsing="false" text="Close" />
-               </items>
-            </Menu>
-            <Menu mnemonicParsing="false" text="View" />
-            <Menu mnemonicParsing="false" text="Analysis" />
-            <Menu mnemonicParsing="false" text="Help">
-               <items>
-                  <MenuItem mnemonicParsing="false" text="Getting Started" />
-               </items>
-            </Menu>
-         </menus>
-      </MenuBar>
-      <Pane prefHeight="141.0" prefWidth="306.0" GridPane.columnSpan="2" GridPane.rowIndex="1">
+      <Pane prefHeight="410.0" prefWidth="773.0" GridPane.columnSpan="2">
          <children>
-            <ScrollPane layoutX="-1.0" layoutY="9.0" prefHeight="513.0" prefWidth="600.0" vbarPolicy="ALWAYS">
-              <content>
-                <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="200.0" prefWidth="200.0" />
-              </content>
-            </ScrollPane>
             <Label layoutX="14.0" layoutY="14.0" text="Airline Raw Data">
                <font>
                   <Font size="29.0" />
                </font>
             </Label>
-            <ScrollPane layoutX="14.0" layoutY="59.0" prefHeight="243.0" prefWidth="561.0">
-               <content>
-                  <TableView prefHeight="245.0" prefWidth="755.0">
+            <Button layoutX="10.0" layoutY="420.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="125.0" text="Analyse" />
+            <Button layoutX="661.0" layoutY="420.0" mnemonicParsing="false" onAction="#addAirlineSingle" prefHeight="25.0" prefWidth="125.0" text="Add" />
+            <Pane layoutX="23.0" layoutY="60.0" prefHeight="309.0" prefWidth="757.0">
+               <children>
+                  <TableView fx:id="tableView" layoutX="1.0" prefHeight="309.0" prefWidth="755.0">
                     <columns>
-                      <TableColumn prefWidth="83.0" text="Airline ID" />
-                      <TableColumn prefWidth="137.0" text="Name" />
-                        <TableColumn minWidth="0.0" prefWidth="129.0" text="Alias" />
-                        <TableColumn minWidth="0.0" prefWidth="69.0" text="IATA" />
-                        <TableColumn minWidth="0.0" prefWidth="67.0" text="ICAO" />
-                        <TableColumn minWidth="0.0" prefWidth="93.0" text="Callsign" />
-                        <TableColumn minWidth="0.0" prefWidth="84.0" text="Country" />
-                        <TableColumn minWidth="8.0" prefWidth="92.0" text="Active" />
+                      <TableColumn fx:id="airlIDcol" prefWidth="83.0" text="Airline ID" />
+                      <TableColumn fx:id="airlNamecol" prefWidth="137.0" text="Name" />
+                        <TableColumn fx:id="airlAliascol" minWidth="0.0" prefWidth="129.0" text="Alias" />
+                        <TableColumn fx:id="airlIATAcol" minWidth="0.0" prefWidth="69.0" text="IATA" />
+                        <TableColumn fx:id="airlICAOcol" minWidth="0.0" prefWidth="67.0" text="ICAO" />
+                        <TableColumn fx:id="airlCallsigncol" minWidth="0.0" prefWidth="93.0" text="Callsign" />
+                        <TableColumn fx:id="airlCountrycol" minWidth="0.0" prefWidth="84.0" text="Country" />
+                        <TableColumn fx:id="airlActivecol" minWidth="8.0" prefWidth="92.0" text="Active" />
                     </columns>
                   </TableView>
-               </content>
-            </ScrollPane>
-            <ScrollPane hbarPolicy="ALWAYS" layoutX="14.0" layoutY="311.0" prefHeight="47.0" prefViewportHeight="29.0" prefViewportWidth="1095.0" prefWidth="561.0" vbarPolicy="NEVER">
-               <content>
-                  <Pane prefHeight="49.0" prefWidth="776.0">
-                     <children>
-                        <TextField layoutX="6.0" layoutY="2.0" prefHeight="25.0" prefWidth="80.0" promptText="Airline ID">
-                           <padding>
-                              <Insets left="2.0" right="2.0" />
-                           </padding>
-                        </TextField>
-                        <TextField layoutX="86.0" layoutY="2.0" prefHeight="25.0" prefWidth="137.0" promptText="Name">
-                           <padding>
-                              <Insets left="2.0" right="2.0" />
-                           </padding>
-                        </TextField>
-                        <TextField layoutX="223.0" layoutY="2.0" prefHeight="25.0" prefWidth="125.0" promptText="Alias">
-                           <padding>
-                              <Insets left="2.0" right="2.0" />
-                           </padding>
-                        </TextField>
-                        <TextField layoutX="350.0" layoutY="2.0" prefHeight="25.0" prefWidth="67.0" promptText="IATA">
-                           <padding>
-                              <Insets left="2.0" right="2.0" />
-                           </padding>
-                        </TextField>
-                        <TextField layoutX="418.0" layoutY="2.0" prefHeight="25.0" prefWidth="69.0" promptText="ICAO">
-                           <padding>
-                              <Insets left="2.0" right="2.0" />
-                           </padding>
-                        </TextField>
-                        <TextField layoutX="487.0" layoutY="2.0" prefHeight="25.0" prefWidth="87.0" promptText="Callsign">
-                           <padding>
-                              <Insets left="2.0" right="2.0" />
-                           </padding>
-                        </TextField>
-                        <TextField layoutX="574.0" layoutY="2.0" prefHeight="25.0" prefWidth="87.0" promptText="Country">
-                           <padding>
-                              <Insets left="2.0" right="2.0" />
-                           </padding>
-                        </TextField>
-                        <TextField layoutX="659.0" layoutY="2.0" prefHeight="25.0" prefWidth="93.0" promptText="Active">
-                           <padding>
-                              <Insets left="2.0" right="2.0" />
-                           </padding>
-                        </TextField>
-                     </children>
-                  </Pane>
-               </content>
-            </ScrollPane>
-            <Button layoutX="14.0" layoutY="367.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="125.0" text="Analyse" />
-            <Button layoutX="452.0" layoutY="367.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="125.0" text="Add" />
+               </children>
+            </Pane>
+            <Pane layoutX="23.0" layoutY="379.0" prefHeight="31.0" prefWidth="757.0">
+               <children>
+                  <TextField fx:id="airlNameBox" layoutX="92.0" layoutY="2.0" prefHeight="25.0" prefWidth="137.0" promptText="Name">
+                     <padding>
+                        <Insets left="2.0" right="2.0" />
+                     </padding>
+                  </TextField>
+                  <TextField fx:id="airlAliasBox" layoutX="229.0" layoutY="2.0" prefHeight="25.0" prefWidth="125.0" promptText="Alias">
+                     <padding>
+                        <Insets left="2.0" right="2.0" />
+                     </padding>
+                  </TextField>
+                  <TextField fx:id="airlIATABox" layoutX="354.0" layoutY="2.0" prefHeight="25.0" prefWidth="67.0" promptText="IATA">
+                     <padding>
+                        <Insets left="2.0" right="2.0" />
+                     </padding>
+                  </TextField>
+                  <TextField fx:id="airlICAOBox" layoutX="421.0" layoutY="2.0" prefHeight="25.0" prefWidth="69.0" promptText="ICAO">
+                     <padding>
+                        <Insets left="2.0" right="2.0" />
+                     </padding>
+                  </TextField>
+                  <TextField fx:id="airlCallsignBox" layoutX="490.0" layoutY="2.0" prefHeight="25.0" prefWidth="87.0" promptText="Callsign">
+                     <padding>
+                        <Insets left="2.0" right="2.0" />
+                     </padding>
+                  </TextField>
+                  <TextField fx:id="airlCountryBox" layoutX="577.0" layoutY="2.0" prefHeight="25.0" prefWidth="87.0" promptText="Country">
+                     <padding>
+                        <Insets left="2.0" right="2.0" />
+                     </padding>
+                  </TextField>
+                  <TextField fx:id="airlActiveBox" layoutX="664.0" layoutY="2.0" prefHeight="25.0" prefWidth="93.0" promptText="Active">
+                     <padding>
+                        <Insets left="2.0" right="2.0" />
+                     </padding>
+                  </TextField>
+                  <TextField fx:id="airlIDBox" layoutY="2.0" prefHeight="25.0" prefWidth="93.0" promptText="Airline ID">
+                     <padding>
+                        <Insets left="2.0" right="2.0" />
+                     </padding>
+                  </TextField>
+               </children>
+            </Pane>
          </children>
       </Pane>
-      <Pane prefHeight="114.0" prefWidth="202.0" GridPane.columnSpan="2" GridPane.rowIndex="2">
+      <Pane prefHeight="114.0" prefWidth="202.0" GridPane.columnSpan="2" GridPane.rowIndex="1">
          <children>
-            <Rectangle arcHeight="5.0" arcWidth="5.0" fill="#ec1fff35" height="114.0" layoutY="1.0" stroke="BLACK" strokeType="INSIDE" width="584.0" />
+            <Rectangle arcHeight="5.0" arcWidth="5.0" fill="#ec1fff35" height="145.0" stroke="BLACK" strokeType="INSIDE" width="800.0" />
          </children>
       </Pane>
    </children>
diff --git a/src/main/resources/airport_raw_data.fxml b/src/main/resources/airport_raw_data.fxml
index 68a726c..911ad53 100644
--- a/src/main/resources/airport_raw_data.fxml
+++ b/src/main/resources/airport_raw_data.fxml
@@ -1,131 +1,96 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.shape.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.text.*?>
-<?import javafx.scene.control.*?>
-<?import java.lang.*?>
-<?import javafx.scene.layout.*?>
+<?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?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?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="533.0" prefWidth="600.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8">
+<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">
   <columnConstraints>
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
   </columnConstraints>
   <rowConstraints>
-    <RowConstraints maxHeight="125.0" minHeight="0.0" prefHeight="9.0" vgrow="SOMETIMES" />
     <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>
    <children>
-      <MenuBar GridPane.columnSpan="2">
-         <menus>
-            <Menu mnemonicParsing="false" text="File">
-               <items>
-                  <MenuItem mnemonicParsing="false" onAction="#importAirports" text="Import Airports" />
-                  <MenuItem mnemonicParsing="false" onAction="#importAirlines" text="Import Airlines" />
-                  <MenuItem mnemonicParsing="false" onAction="#importRoutes" text="Import Routes" />
-                  <MenuItem mnemonicParsing="false" onAction="#importFlightData" text="Import Flight Data" />
-                  <SeparatorMenuItem mnemonicParsing="false" />
-                  <MenuItem mnemonicParsing="false" text="Close" />
-               </items>
-            </Menu>
-            <Menu mnemonicParsing="false" text="View" />
-            <Menu mnemonicParsing="false" text="Analysis" />
-            <Menu mnemonicParsing="false" text="Help">
-               <items>
-                  <MenuItem mnemonicParsing="false" text="Getting Started" />
-               </items>
-            </Menu>
-         </menus>
-      </MenuBar>
-      <Pane prefHeight="141.0" prefWidth="306.0" GridPane.columnSpan="2" GridPane.rowIndex="1">
+      <Pane prefHeight="141.0" prefWidth="600.0" GridPane.columnSpan="2">
          <children>
-            <ScrollPane layoutX="-1.0" layoutY="9.0" prefHeight="513.0" prefWidth="600.0" vbarPolicy="ALWAYS">
-              <content>
-                <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="200.0" prefWidth="200.0" />
-              </content>
-            </ScrollPane>
             <Label layoutX="14.0" layoutY="14.0" text="Airport Raw Data">
                <font>
                   <Font size="29.0" />
                </font>
             </Label>
-            <ScrollPane layoutX="14.0" layoutY="59.0" prefHeight="243.0" prefWidth="563.0">
-               <content>
-                  <TableView prefHeight="245.0" prefWidth="1094.0">
-                    <columns>
-                      <TableColumn prefWidth="83.0" text="Airport ID" />
-                      <TableColumn prefWidth="137.0" text="Name" />
-                        <TableColumn minWidth="0.0" prefWidth="129.0" text="City" />
-                        <TableColumn minWidth="0.0" prefWidth="96.0" text="Country" />
-                        <TableColumn minWidth="0.0" prefWidth="87.0" text="IATA/FAA" />
-                        <TableColumn minWidth="0.0" prefWidth="48.0" text="ICAO" />
-                        <TableColumn minWidth="0.0" prefWidth="82.0" text="Latitude" />
-                        <TableColumn minWidth="8.0" prefWidth="92.0" text="Longitude" />
-                        <TableColumn minWidth="0.0" prefWidth="78.0" text="Altitude" />
-                        <TableColumn minWidth="0.0" text="Timezone" />
-                        <TableColumn minWidth="0.0" prefWidth="0.0" text="DST" />
-                        <TableColumn minWidth="0.0" prefWidth="181.0" text="Tz database time zone" />
-                    </columns>
-                  </TableView>
-               </content>
-            </ScrollPane>
-            <ScrollPane hbarPolicy="ALWAYS" layoutX="14.0" layoutY="311.0" prefHeight="47.0" prefViewportHeight="29.0" prefViewportWidth="1095.0" prefWidth="563.0" vbarPolicy="NEVER">
+            <ScrollPane hbarPolicy="ALWAYS" layoutX="14.0" layoutY="364.0" prefHeight="47.0" prefViewportHeight="29.0" prefViewportWidth="1095.0" prefWidth="770.0" vbarPolicy="NEVER">
                <content>
-                  <Pane prefHeight="49.0" prefWidth="1097.0">
+                  <Pane prefHeight="29.0" prefWidth="1087.0">
                      <children>
-                        <TextField layoutX="6.0" layoutY="2.0" prefHeight="25.0" prefWidth="80.0" promptText="Airport ID">
+                        <TextField layoutX="6.0" layoutY="2.0" prefHeight="25.0" prefWidth="83.0" promptText="Airport ID">
                            <padding>
                               <Insets left="2.0" right="2.0" />
                            </padding>
                         </TextField>
-                        <TextField layoutX="86.0" layoutY="2.0" prefHeight="25.0" prefWidth="137.0" promptText="Name">
+                        <TextField layoutX="89.0" layoutY="2.0" prefHeight="25.0" prefWidth="137.0" promptText="Name">
                            <padding>
                               <Insets left="2.0" right="2.0" />
                            </padding>
                         </TextField>
-                        <TextField layoutX="223.0" layoutY="2.0" prefHeight="25.0" prefWidth="130.0" promptText="City">
+                        <TextField layoutX="226.0" layoutY="2.0" prefHeight="25.0" prefWidth="129.0" promptText="City">
                            <padding>
                               <Insets left="2.0" right="2.0" />
                            </padding>
                         </TextField>
-                        <TextField layoutX="353.0" layoutY="2.0" prefHeight="25.0" prefWidth="95.0" promptText="Country">
+                        <TextField layoutX="355.0" layoutY="2.0" prefHeight="25.0" prefWidth="96.0" promptText="Country">
                            <padding>
                               <Insets left="2.0" right="2.0" />
                            </padding>
                         </TextField>
-                        <TextField layoutX="448.0" layoutY="2.0" prefHeight="25.0" prefWidth="87.0" promptText="IATA/FAA">
+                        <TextField layoutX="451.0" layoutY="2.0" prefHeight="25.0" prefWidth="87.0" promptText="IATA/FAA">
                            <padding>
                               <Insets left="2.0" right="2.0" />
                            </padding>
                         </TextField>
-                        <TextField layoutX="535.0" layoutY="2.0" prefHeight="25.0" prefWidth="48.0" promptText="ICAO">
+                        <TextField layoutX="538.0" layoutY="2.0" prefHeight="25.0" prefWidth="48.0" promptText="ICAO">
                            <padding>
                               <Insets left="2.0" right="2.0" />
                            </padding>
                         </TextField>
-                        <TextField layoutX="583.0" layoutY="2.0" prefHeight="25.0" prefWidth="84.0" promptText="Latitude">
+                        <TextField layoutX="586.0" layoutY="2.0" prefHeight="25.0" prefWidth="82.0" promptText="Latitude">
                            <padding>
                               <Insets left="2.0" right="2.0" />
                            </padding>
                         </TextField>
-                        <TextField layoutX="667.0" layoutY="2.0" prefHeight="25.0" prefWidth="89.0" promptText="Longitude">
+                        <TextField layoutX="668.0" layoutY="2.0" prefHeight="25.0" prefWidth="92.0" promptText="Longitude">
                            <padding>
                               <Insets left="2.0" right="2.0" />
                            </padding>
                         </TextField>
-                        <TextField layoutX="756.0" layoutY="2.0" prefHeight="25.0" prefWidth="80.0" promptText="Altitude">
+                        <TextField layoutX="760.0" layoutY="2.0" prefHeight="25.0" prefWidth="78.0" promptText="Altitude">
                            <padding>
                               <Insets left="2.0" right="2.0" />
                            </padding>
                         </TextField>
-                        <TextField layoutX="836.0" layoutY="2.0" prefHeight="25.0" prefWidth="81.0" promptText="Timezone">
+                        <TextField layoutX="838.0" layoutY="2.0" prefHeight="25.0" prefWidth="80.0" promptText="Timezone">
                            <padding>
                               <Insets left="2.0" right="2.0" />
                            </padding>
                         </TextField>
-                        <TextField layoutX="917.0" layoutY="2.0" prefHeight="25.0" prefWidth="176.0" promptText="Tz database time zone">
+                        <TextField layoutX="1020.0" layoutY="2.0" prefHeight="25.0" prefWidth="182.0" promptText="Tz database time zone">
+                           <padding>
+                              <Insets left="2.0" right="2.0" />
+                           </padding>
+                        </TextField>
+                        <TextField layoutX="918.0" layoutY="2.0" prefHeight="25.0" prefWidth="102.0" promptText="DST">
                            <padding>
                               <Insets left="2.0" right="2.0" />
                            </padding>
@@ -134,13 +99,32 @@
                   </Pane>
                </content>
             </ScrollPane>
-            <Button layoutX="14.0" layoutY="367.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="125.0" text="Analyse" />
-            <Button layoutX="452.0" layoutY="367.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="125.0" text="Add" />
+            <Button layoutX="10.0" layoutY="420.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="125.0" text="Analyse" />
+            <Button layoutX="661.0" layoutY="420.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="125.0" text="Add" />
+            <Pane layoutX="15.0" layoutY="60.0" prefHeight="295.0" prefWidth="772.0">
+               <children>
+                  <TableView fx:id="tableViewAirportRD" prefHeight="293.0" prefWidth="770.0">
+                    <columns>
+                      <TableColumn fx:id="airpIDcol" prefWidth="83.0" text="Airport ID" />
+                      <TableColumn fx:id="airpNamecol" prefWidth="137.0" text="Name" />
+                        <TableColumn fx:id="airpCitycol" minWidth="0.0" prefWidth="129.0" text="City" />
+                        <TableColumn fx:id="airpCountrycol" minWidth="0.0" prefWidth="96.0" text="Country" />
+                        <TableColumn fx:id="airpIATAFFAcol" minWidth="0.0" prefWidth="87.0" text="IATA/FAA" />
+                        <TableColumn fx:id="airpICAOcol" minWidth="0.0" prefWidth="48.0" text="ICAO" />
+                        <TableColumn fx:id="airpLatitudecol" minWidth="0.0" prefWidth="82.0" text="Latitude" />
+                        <TableColumn fx:id="airpLongitudecol" minWidth="8.0" prefWidth="92.0" text="Longitude" />
+                        <TableColumn fx:id="airpAltitudecol" minWidth="0.0" prefWidth="78.0" text="Altitude" />
+                        <TableColumn fx:id="airpTimezonecol" minWidth="0.0" text="Timezone" />
+                        <TableColumn fx:id="airpDSTcol" prefWidth="102.0" text="DST" />
+                        <TableColumn fx:id="airpTzcol" minWidth="0.0" prefWidth="182.0" text="Tz database time zone" />
+                    </columns>
+                  </TableView>
+               </children></Pane>
          </children>
       </Pane>
-      <Pane prefHeight="114.0" prefWidth="202.0" GridPane.columnSpan="2" GridPane.rowIndex="2">
+      <Pane prefHeight="153.0" prefWidth="800.0" GridPane.columnSpan="2" GridPane.rowIndex="1">
          <children>
-            <Rectangle arcHeight="5.0" arcWidth="5.0" fill="#ec1fff35" height="114.0" layoutY="1.0" stroke="BLACK" strokeType="INSIDE" width="584.0" />
+            <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>
diff --git a/src/main/resources/menu.fxml b/src/main/resources/menu.fxml
index bb8e6ac..57269fa 100644
--- a/src/main/resources/menu.fxml
+++ b/src/main/resources/menu.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.control.SeparatorMenuItem?>
 <?import javafx.scene.layout.VBox?>
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.MenuController">
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.MenuController">
    <children>
       <MenuBar>
         <menus>
@@ -25,7 +25,7 @@
                   <Menu mnemonicParsing="false" text="Airport">
                     <items>
                         <MenuItem mnemonicParsing="false" text="Summary" />
-                        <MenuItem mnemonicParsing="false" text="Raw Data" />
+                        <MenuItem mnemonicParsing="false" onAction="#viewAirportRawData" text="Raw Data" />
                     </items>
                   </Menu>
                   <Menu mnemonicParsing="false" text="Airline">
@@ -37,7 +37,7 @@
                   <Menu mnemonicParsing="false" text="Route">
                      <items>
                         <MenuItem mnemonicParsing="false" text="Summary" />
-                        <MenuItem mnemonicParsing="false" text="Raw Data" />
+                        <MenuItem mnemonicParsing="false" onAction="#viewRouteRawData" text="Raw Data" />
                      </items>
                   </Menu>
                   <Menu mnemonicParsing="false" text="Flight">
diff --git a/src/main/resources/route_raw_data.fxml b/src/main/resources/route_raw_data.fxml
index 9860f9b..f4a3083 100644
--- a/src/main/resources/route_raw_data.fxml
+++ b/src/main/resources/route_raw_data.fxml
@@ -1,74 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.shape.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.text.*?>
-<?import javafx.scene.control.*?>
-<?import java.lang.*?>
-<?import javafx.scene.layout.*?>
+<?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?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?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="533.0" prefWidth="600.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8">
+<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">
   <columnConstraints>
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
   </columnConstraints>
   <rowConstraints>
-    <RowConstraints maxHeight="125.0" minHeight="0.0" prefHeight="9.0" vgrow="SOMETIMES" />
     <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>
    <children>
-      <MenuBar GridPane.columnSpan="2">
-         <menus>
-            <Menu mnemonicParsing="false" text="File">
-               <items>
-                  <MenuItem mnemonicParsing="false" onAction="#importAirports" text="Import Airports" />
-                  <MenuItem mnemonicParsing="false" onAction="#importAirlines" text="Import Airlines" />
-                  <MenuItem mnemonicParsing="false" onAction="#importRoutes" text="Import Routes" />
-                  <MenuItem mnemonicParsing="false" onAction="#importFlightData" text="Import Flight Data" />
-                  <SeparatorMenuItem mnemonicParsing="false" />
-                  <MenuItem mnemonicParsing="false" text="Close" />
-               </items>
-            </Menu>
-            <Menu mnemonicParsing="false" text="View" />
-            <Menu mnemonicParsing="false" text="Analysis" />
-            <Menu mnemonicParsing="false" text="Help">
-               <items>
-                  <MenuItem mnemonicParsing="false" text="Getting Started" />
-               </items>
-            </Menu>
-         </menus>
-      </MenuBar>
-      <Pane prefHeight="141.0" prefWidth="306.0" GridPane.columnSpan="2" GridPane.rowIndex="1">
+      <Pane prefHeight="141.0" prefWidth="306.0" GridPane.columnSpan="2">
          <children>
-            <ScrollPane layoutX="-1.0" layoutY="9.0" prefHeight="513.0" prefWidth="600.0" vbarPolicy="ALWAYS">
-              <content>
-                <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="200.0" prefWidth="200.0" />
-              </content>
-            </ScrollPane>
             <Label layoutX="14.0" layoutY="14.0" text="Route Raw Data">
                <font>
                   <Font size="29.0" />
                </font>
             </Label>
-            <ScrollPane layoutX="14.0" layoutY="59.0" prefHeight="243.0" prefWidth="559.0">
-               <content>
-                  <TableView prefHeight="245.0" prefWidth="1025.0">
-                    <columns>
-                      <TableColumn prefWidth="67.0" text="Airline" />
-                      <TableColumn prefWidth="86.0" text="Airline ID" />
-                        <TableColumn minWidth="0.0" prefWidth="124.0" text="Source airport" />
-                        <TableColumn minWidth="0.0" prefWidth="141.0" text="Source airport ID" />
-                        <TableColumn minWidth="0.0" prefWidth="160.0" text="Destination airport" />
-                        <TableColumn minWidth="0.0" prefWidth="184.0" text="Destination airport ID" />
-                        <TableColumn minWidth="0.0" prefWidth="95.0" text="Codeshare" />
-                        <TableColumn minWidth="0.0" prefWidth="69.0" text="Stops" />
-                        <TableColumn prefWidth="98.0" text="Equipment" />
-                    </columns>
-                  </TableView>
-               </content>
-            </ScrollPane>
-            <ScrollPane hbarPolicy="ALWAYS" layoutX="14.0" layoutY="311.0" prefHeight="47.0" prefViewportHeight="29.0" prefViewportWidth="1095.0" prefWidth="559.0" vbarPolicy="NEVER">
+            <ScrollPane hbarPolicy="ALWAYS" layoutX="10.0" layoutY="364.0" prefHeight="47.0" prefViewportHeight="29.0" prefViewportWidth="1095.0" prefWidth="776.0" vbarPolicy="NEVER">
                <content>
                   <Pane prefHeight="49.0" prefWidth="1021.0">
                      <children>
@@ -121,13 +84,30 @@
                   </Pane>
                </content>
             </ScrollPane>
-            <Button layoutX="14.0" layoutY="367.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="125.0" text="Analyse" />
-            <Button layoutX="452.0" layoutY="367.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="125.0" text="Add" />
+            <Button layoutX="10.0" layoutY="420.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="125.0" text="Analyse" />
+            <Button layoutX="661.0" layoutY="420.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="125.0" text="Add" />
+            <Pane layoutX="8.0" layoutY="53.0" prefHeight="300.0" prefWidth="776.0">
+               <children>
+                  <TableView layoutX="-1.0" prefHeight="300.0" prefWidth="784.0">
+                    <columns>
+                      <TableColumn prefWidth="67.0" text="Airline" />
+                      <TableColumn prefWidth="86.0" text="Airline ID" />
+                        <TableColumn minWidth="0.0" prefWidth="124.0" text="Source airport" />
+                        <TableColumn minWidth="0.0" prefWidth="141.0" text="Source airport ID" />
+                        <TableColumn minWidth="0.0" prefWidth="160.0" text="Destination airport" />
+                        <TableColumn minWidth="0.0" prefWidth="184.0" text="Destination airport ID" />
+                        <TableColumn minWidth="0.0" prefWidth="95.0" text="Codeshare" />
+                        <TableColumn minWidth="0.0" prefWidth="69.0" text="Stops" />
+                        <TableColumn prefWidth="98.0" text="Equipment" />
+                    </columns>
+                  </TableView>
+               </children>
+            </Pane>
          </children>
       </Pane>
-      <Pane prefHeight="114.0" prefWidth="202.0" GridPane.columnSpan="2" GridPane.rowIndex="2">
+      <Pane prefHeight="114.0" prefWidth="202.0" GridPane.columnSpan="2" GridPane.rowIndex="1">
          <children>
-            <Rectangle arcHeight="5.0" arcWidth="5.0" fill="#ec1fff35" height="114.0" layoutY="1.0" stroke="BLACK" strokeType="INSIDE" width="584.0" />
+            <Rectangle arcHeight="5.0" arcWidth="5.0" fill="#ec1fff35" height="144.0" layoutY="1.0" stroke="BLACK" strokeType="INSIDE" width="800.0" />
          </children>
       </Pane>
    </children>