diff --git a/Universal-Space-Operations-Center/src/main/java/com/ksatstuttgart/usoc/ConfigHandler.java b/Universal-Space-Operations-Center/src/main/java/com/ksatstuttgart/usoc/ConfigHandler.java
index 3afe100..171bd34 100644
--- a/Universal-Space-Operations-Center/src/main/java/com/ksatstuttgart/usoc/ConfigHandler.java
+++ b/Universal-Space-Operations-Center/src/main/java/com/ksatstuttgart/usoc/ConfigHandler.java
@@ -424,7 +424,7 @@ public static boolean rebuildGui(String path, String pathMod, Stage stage) throw
             GuiBuilder.logPanelBuilder("fxml/LogPanel.fxml", path);
             GuiBuilder.logPanelControlBuilder("gui/controller/LogPanelController.java", path);
             GuiBuilder.mainFrameBuilder("fxml/MainFrame.fxml", path);
-            GuiBuilder.StateBuilder("fxml/StatePanel.fxml", path);
+            GuiBuilder.StatePanelBuilder("fxml/StatePanel.fxml", path);
             GuiBuilder.statePanelControlBuilder("gui/controller/StatePanelController.java", path);
             
             System.out.println("FXML has been reseted and regenerated completely.");
@@ -453,7 +453,7 @@ public static boolean rebuildGui(String path, String pathMod, Stage stage) throw
             // Checks if STATE PROPERTIES has been modified since last compilation
             if (statePanelMod) {
                 GuiBuilder.mainFrameBuilder("fxml/MainFrame.fxml", path);
-                GuiBuilder.StateBuilder("fxml/StatePanel.fxml", path);
+                GuiBuilder.StatePanelBuilder("fxml/StatePanel.fxml", path);
                 GuiBuilder.statePanelControlBuilder("gui/controller/StatePanelController.java", path);
             }
             rebuildGui = true;
diff --git a/Universal-Space-Operations-Center/src/main/java/com/ksatstuttgart/usoc/GuiBuilder.java b/Universal-Space-Operations-Center/src/main/java/com/ksatstuttgart/usoc/GuiBuilder.java
index 705ee71..fde1ba2 100644
--- a/Universal-Space-Operations-Center/src/main/java/com/ksatstuttgart/usoc/GuiBuilder.java
+++ b/Universal-Space-Operations-Center/src/main/java/com/ksatstuttgart/usoc/GuiBuilder.java
@@ -323,6 +323,7 @@ public static void mainPanelControlBuilder(String filePath, String configPath) t
                 + "import com.ksatstuttgart.usoc.data.message.Var;\n"
                 + "import com.ksatstuttgart.usoc.data.message.dataPackage.Sensor;\n"
                 + "import java.util.ResourceBundle;\n"
+                + "import javafx.fxml.FXML;\n"
                 + "import javafx.fxml.Initializable;\n"
                 + "import javafx.scene.chart.LineChart;\n"
                 + "import javafx.scene.chart.XYChart;");
@@ -428,7 +429,7 @@ public static void mainPanelControlBuilder(String filePath, String configPath) t
                 + "        // TODO\n"
                 + "        MainController.getInstance().addDataUpdateListener(new UpdateListener());");
         if (GNSS3dView) {
-            writer.println("        new GNSSPanel(pane);");
+            writer.println("        GNSSPanel.addGNSSPaneltoStackPane(pane);");
         }
         writer.println("    }\n"
                 + "}");
@@ -515,10 +516,10 @@ public static void logPanelBuilder(String filePath, String configPath) throws Fi
                     + "<BorderPane> \n"
                     + "<padding><Insets top=\"5\" right=\"5\" bottom=\"5\" left=\"5\"/></padding> \n"
                     + "  <top> \n"
-                    + "    <GridPane> \n"
+                    + "    <GridPane alignment=\"TOP_CENTER\" BorderPane.alignment=\"CENTER\">\n"
                     + "      <columnConstraints> \n"
-                    + "        <ColumnConstraints hgrow=\"SOMETIMES\" minWidth=\"10.0\" prefWidth=\"100.0\" /> \n"
-                    + "        <ColumnConstraints hgrow=\"SOMETIMES\" minWidth=\"10.0\" prefWidth=\"100.0\" /> \n"
+                    + "        <ColumnConstraints hgrow=\"SOMETIMES\" /> \n"
+                    + "        <ColumnConstraints hgrow=\"SOMETIMES\" /> \n"
                     + "      </columnConstraints> \n"
                     + "      <rowConstraints>");
 
@@ -551,15 +552,15 @@ public static void logPanelBuilder(String filePath, String configPath) throws Fi
                 switch (control) {
                     case "button":
                         writer.println("        <Button text=\"" + config.getProperty("bText[" + counter + "][" + j + "]") + "\" onAction=\"#button" + counter + j + "\" "
-                                + "mnemonicParsing=\"false\"" + " GridPane.columnIndex=\"" + position[0] + "\" GridPane.rowIndex=\"" + position[1] + "\" />");
+                                + "mnemonicParsing=\"false\"" + " GridPane.columnIndex=\"" + position[0] + "\" GridPane.rowIndex=\"" + position[1] + "\" maxWidth=\"-Infinity\" GridPane.valignment=\"CENTER\" GridPane.vgrow=\"SOMETIMES\" GridPane.halignment=\"RIGHT\" GridPane.hgrow=\"SOMETIMES\"/>");
                         break;
                     case "textField":
                         writer.println("        <TextField promptText=\"" + config.getProperty("promptText[" + counter + "][" + j + "]")
-                                + "\" " + "GridPane.columnIndex=\"" + position[0] + "\" GridPane.rowIndex=\"" + position[1] + "\" />");
+                                + "\" " + "GridPane.columnIndex=\"" + position[0] + "\" GridPane.rowIndex=\"" + position[1] + "\" GridPane.halignment=\"RIGHT\" maxWidth=\"60.0\" prefWidth=\"60.0\" GridPane.hgrow=\"SOMETIMES\" GridPane.valignment=\"CENTER\" GridPane.vgrow=\"SOMETIMES\" />");
                         break;
                     case "label":
                         writer.println("        <Label text=\"" + config.getProperty("lText[" + counter + "][" + j + "]")
-                                + "\" " + "GridPane.columnIndex=\"" + position[0] + "\" GridPane.rowIndex=\"" + position[1] + "\" />");
+                                + "\" " + "GridPane.columnIndex=\"" + position[0] + "\" GridPane.rowIndex=\"" + position[1] + "\" GridPane.halignment=\"RIGHT\" GridPane.hgrow=\"SOMETIMES\" GridPane.valignment=\"CENTER\" GridPane.vgrow=\"SOMETIMES\" />");
                         break;
                 }
             }
@@ -601,6 +602,8 @@ public static void logPanelControlBuilder(String filePath, String configPath) th
         Properties config = ConfigHandler.getAllValues(configPath);
         int numberOfAddTabs = ConfigHandler.countItems("tabTitle", configPath);
         int maxNumberOfItems = 0;
+        boolean serialPanel = Boolean.parseBoolean(config.getProperty("serialPanel"));
+        boolean iridiumPanel = Boolean.parseBoolean(config.getProperty("iridiumPanel"));
         String path = "src/main/java/com/ksatstuttgart/usoc/";
 
         for (int counter = 1; counter <= numberOfAddTabs; counter++) {
@@ -628,32 +631,48 @@ public static void logPanelControlBuilder(String filePath, String configPath) th
 
         // Writes data in LogController.java file
         PrintWriter writer = new PrintWriter(path + filePath);
-        writer.println("package com.ksatstuttgart.usoc.gui.controller; \n");
-        writer.println("import java.net.URL; \n"
-                + "import java.util.ResourceBundle; \n"
-                + "import javafx.event.ActionEvent; \n"
-                + "import javafx.fxml.FXML; \n"
-                + "import com.ksatstuttgart.usoc.controller.communication.SerialComm;\n"
-                + "import com.ksatstuttgart.usoc.controller.communication.MailReceiver;\n"
-                + "import com.ksatstuttgart.usoc.controller.MainController;\n"
-                + "import java.util.ArrayList;\n"
-                + "import com.ksatstuttgart.usoc.controller.MessageController;\n"
-                + "import com.ksatstuttgart.usoc.data.DataSource;\n"
-                + "import com.ksatstuttgart.usoc.data.ErrorEvent;\n"
-                + "import com.ksatstuttgart.usoc.data.MailEvent;\n"
-                + "import com.ksatstuttgart.usoc.data.SerialEvent;\n"
-                + "import com.ksatstuttgart.usoc.data.USOCEvent;\n"
-                + "import javafx.fxml.Initializable; \n"
-                + "import javafx.scene.control.ComboBox; \n"
-                + "import javafx.scene.control.TextArea;\n"
-                + "import javax.mail.Address; \n");
+        writer.println("package com.ksatstuttgart.usoc.gui.controller;\n");
+        writer.println("import java.net.URL;\n"
+                + "import java.util.ResourceBundle;\n"
+                + "import javafx.event.ActionEvent;\n"
+                + "import javafx.fxml.FXML;\n"
+                + "import javafx.fxml.Initializable;\n");
+        if (serialPanel == true || iridiumPanel == true) {
+            writer.println("// Imports for serialLog or iridiumLog\n"
+                    + "import com.ksatstuttgart.usoc.controller.MainController;\n"
+                    + "import com.ksatstuttgart.usoc.controller.MessageController;\n"
+                    + "import com.ksatstuttgart.usoc.data.DataSource;\n"
+                    + "import com.ksatstuttgart.usoc.data.ErrorEvent;\n"
+                    + "import com.ksatstuttgart.usoc.data.USOCEvent;\n"
+                    + "import javafx.scene.control.TextArea;\n");
+        }
+        if (serialPanel) {
+            writer.println("// Specific imports for serialLog\n"
+                    + "import com.ksatstuttgart.usoc.controller.communication.SerialComm;\n"
+                    + "import java.util.ArrayList;\n"
+                    + "import com.ksatstuttgart.usoc.data.SerialEvent;\n"
+                    + "import javafx.scene.control.ComboBox;\n");
+        }
+        if (iridiumPanel) {
+            writer.println("// Specific imports for iridiumLog\n"
+                    + "import com.ksatstuttgart.usoc.controller.communication.MailReceiver;\n"
+                    + "import com.ksatstuttgart.usoc.data.MailEvent;\n"
+                    + "import java.util.Date;\n"
+                    + "import javafx.scene.control.Label;\n"
+                    + "import javax.mail.Address;\n");
+        }
+        
         writer.println("/** \n"
                 + " * \n"
                 + " * @author Victor \n"
                 + " */ \n");
-        writer.println("public class LogPanelController extends DataController implements Initializable { \n");
+        writer.print("public class LogPanelController ");
+        if (serialPanel || iridiumPanel) {
+            writer.print("extends DataController ");
+        }
+        writer.println("implements Initializable { \n");
 
-        if (Boolean.parseBoolean(config.getProperty("serialPanel"))) {
+        if (serialPanel) {
             writer.println("    @FXML private ComboBox comboBox1; \n"
                     + "    @FXML private ComboBox comboBox2; \n"
                     + "    @FXML private ComboBox comboBox3; \n"
@@ -684,8 +703,12 @@ public static void logPanelControlBuilder(String filePath, String configPath) th
                     + "    } \n");
         }
 
-        if (Boolean.parseBoolean(config.getProperty("iridiumPanel"))) {
-            writer.println("    @FXML private TextArea iridiumTextArea; \n\n"
+        if (iridiumPanel) {
+            writer.println("    @FXML private TextArea iridiumTextArea; \n"
+                    + "    @FXML private Label iridiumLastFrom; \n"
+                    + "    @FXML private Label iridiumLastSubject; \n"
+                    + "    @FXML private Label iridiumLastFilename; \n"
+                    + "    @FXML private Label iridiumLastTimestamp; \n\n"
                     + "    @FXML \n"
                     + "    private void iridiumOpen(ActionEvent event) { \n"
                     + "        System.out.println(\"Open button in iridium log has been pressed!\");\n"
@@ -707,6 +730,77 @@ public static void logPanelControlBuilder(String filePath, String configPath) th
                     + "        MailReceiver.getInstance().reconnect(); \n"
                     + "    } \n");
         }
+        
+        if (serialPanel == true && iridiumPanel == true) {
+            
+            writer.println("    @Override\n"
+                    + "    public void updateData(MessageController msgController, USOCEvent ue) {\n"
+                    + "        if (ue instanceof MailEvent) {\n"
+                    + "            MailEvent e = (MailEvent) ue;\n"
+                    + "            String s = \"\";\n"
+                    + "            for (Address from : e.getFrom()) {\n"
+                    + "                s += \",\" + from.toString();\n"
+                    + "            }\n"
+                    + "            //Setting label texts\n"
+                    + "            iridiumLastFrom.setText(s.substring(1));\n"
+                    + "            iridiumLastSubject.setText(e.getSubject());\n"
+                    + "            iridiumLastFilename.setText(e.getFilename());\n"
+                    + "            iridiumLastTimestamp.setText(new Date(e.getTimeStampGmail()).toString());\n"
+                    + "            iridiumTextArea.setText(msgController.getData().toString());\n"
+                    + "        } else if (ue instanceof SerialEvent) {\n"
+                    + "            serialTextArea.setText(((SerialEvent)ue).getMsg());\n"
+                    + "        } else if (ue instanceof ErrorEvent) {\n"
+                    + "            if (DataSource.MAIL == ue.getDataSource()) {\n"
+                    + "                iridiumTextArea.setText(((ErrorEvent) ue).getErrorMessage());\n"
+                    + "            } else if (DataSource.SERIAL == ue.getDataSource()) {\n"
+                    + "                serialTextArea.setText(((ErrorEvent) ue).getErrorMessage());\n"
+                    + "            }\n"
+                    + "        } else {\n"
+                    + "            serialTextArea.setText(msgController.getData().toString());\n"
+                    + "            iridiumTextArea.setText(msgController.getData().toString());\n"
+                    + "        }\n"
+                    + "    }\n");
+            
+        } else if (serialPanel == true && iridiumPanel == false) {
+            
+            writer.println("    @Override\n"
+                    + "    public void updateData(MessageController msgController, USOCEvent ue) {\n"
+                    + "        if (ue instanceof SerialEvent) {\n"
+                    + "            serialTextArea.setText(((SerialEvent)ue).getMsg());\n"
+                    + "        } else if (ue instanceof ErrorEvent) {\n"
+                    + "            if (DataSource.SERIAL == ue.getDataSource()) {\n"
+                    + "                serialTextArea.setText(((ErrorEvent) ue).getErrorMessage());\n"
+                    + "            }\n"
+                    + "        } else {\n"
+                    + "            serialTextArea.setText(msgController.getData().toString());\n"
+                    + "        }\n"
+                    + "    }\n");
+            
+        } else if (serialPanel == false && iridiumPanel == true) {
+            
+            writer.println("    @Override\n"
+                    + "    public void updateData(MessageController msgController, USOCEvent ue) {\n"
+                    + "        if (ue instanceof MailEvent) {\n"
+                    + "            MailEvent e = (MailEvent) ue;\n"
+                    + "            String s = \"\";\n"
+                    + "            for (Address from : e.getFrom()) {\n"
+                    + "                s += \",\" + from.toString();\n"
+                    + "            }\n"
+                    + "            //Setting label texts\n"
+                    + "            iridiumLastFrom.setText(s.substring(1));\n"
+                    + "            iridiumLastSubject.setText(e.getSubject());\n"
+                    + "            iridiumLastFilename.setText(e.getFilename());\n"
+                    + "            iridiumLastTimestamp.setText(new Date(e.getTimeStampGmail()).toString());\n"
+                    + "            iridiumTextArea.setText(msgController.getData().toString());\n"
+                    + "        } else if (ue instanceof ErrorEvent) {\n"
+                    + "            if (DataSource.MAIL == ue.getDataSource()) {\n"
+                    + "                iridiumTextArea.setText(((ErrorEvent) ue).getErrorMessage());\n"
+                    + "            }\n"
+                    + "        } else {\n"
+                    + "            iridiumTextArea.setText(msgController.getData().toString());\n"
+                    + "        }\n"
+                    + "    }\n");
+        }
 
         for (int counter = 1; counter <= numberOfAddTabs; counter++) {
             int numberOfControlItems = ConfigHandler.countItems("control[" + counter + "]", configPath);
@@ -718,42 +812,23 @@ public static void logPanelControlBuilder(String filePath, String configPath) th
             }
         }
         
-        writer.println("    @Override\n"
-                + "    public void updateData(MessageController msgController, USOCEvent ue) {\n"
-                + "        if (ue instanceof MailEvent) {\n"
-                + "            MailEvent e = (MailEvent) ue;\n"
-                + "            String s = \"\";\n"
-                + "            for (Address from : e.getFrom()) {\n"
-                + "                s += \",\" + from.toString();\n"
-                + "            }\n"
-                + "            //Setting label texts\n"
-                + "            //lastFrom.setText(s.substring(1));\n"
-                + "            //lastSubject.setText(e.getSubject());\n"
-                + "            //lastFilename.setText(e.getFilename());\n"
-                + "            //lastTimestamp.setText(new Date(e.getTimeStampGmail()).toString());\n"
-                + "\n"
-                + "            //TODO: change this to iridiumTextArea\n"
-                + "            serialTextArea.setText(msgController.getData().toString());\n"
-                + "        } else if (ue instanceof SerialEvent) {\n"
-                + "            serialTextArea.setText(((SerialEvent)ue).getMsg());\n"
-                + "        } else if (ue instanceof ErrorEvent) {\n"
-                + "            if (DataSource.MAIL == ue.getDataSource()) {\n"
-                + "                //TODO: change this to iridiumTextArea\n"
-                + "                serialTextArea.setText(((ErrorEvent) ue).getErrorMessage());\n"
-                + "            } else if (DataSource.SERIAL == ue.getDataSource()) {\n"
-                + "                serialTextArea.setText(((ErrorEvent) ue).getErrorMessage());\n"
-                + "            }\n"
-                + "        } else {\n"
-                + "            serialTextArea.setText(msgController.getData().toString());\n"
-                + "        }\n"
-                + "    }\n");
         writer.println("    @Override \n"
                 + "    public void initialize(URL url, ResourceBundle rb) { \n"
-                + "        // TODO \n"
-                + "        MainController.startPortThread(this);\n"
-                + "        MainController.getInstance().addDataUpdateListener(new UpdateListener());\n"
-                + "        setData(); \n"
-                + "    } \n"
+                + "        // TODO");
+        
+        if (serialPanel == true && iridiumPanel == true) {
+            writer.println("        MainController.startPortThread(this);\n"
+                    + "        MainController.getInstance().addDataUpdateListener(new UpdateListener());\n"
+                    + "        setData();");
+        } else if (serialPanel == true && iridiumPanel == false) {
+            writer.println("        MainController.startPortThread(this);\n"
+                    + "        MainController.getInstance().addDataUpdateListener(new UpdateListener());\n"
+                    + "        setData();");
+        } else if (serialPanel == false && iridiumPanel == true) {
+            writer.println("        MainController.getInstance().addDataUpdateListener(new UpdateListener());");
+        }
+
+        writer.println("    } \n"
                 + "}");
 
         writer.close();
@@ -770,7 +845,7 @@ public static void logPanelControlBuilder(String filePath, String configPath) th
      * @param configPath
      * @throws java.io.IOException
      */
-    public static void StateBuilder(String filePath, String configPath) throws IOException {
+    public static void StatePanelBuilder(String filePath, String configPath) throws IOException {
 
         // Declares necessary parameters
         Properties config = ConfigHandler.getAllValues(configPath);
@@ -786,60 +861,66 @@ public static void StateBuilder(String filePath, String configPath) throws IOExc
                     + "<?import javafx.scene.control.*?> \n"
                     + "<?import javafx.scene.layout.*?> \n"
                     + "<?import javafx.geometry.*?> \n");
-            writer.println(""
-                    + "<ScrollPane xmlns=\"http://javafx.com/javafx/8\" xmlns:fx=\"http://javafx.com/fxml/1\" fitToHeight=\"true\" fitToWidth=\"true\" prefHeight=\"200.0\" prefWidth=\"200.0\" BorderPane.alignment=\"CENTER\"> \n"
-                    + "  <content> \n"
-                    + "    <VBox> \n"
-                    + "      <children>");
+            writer.println("<AnchorPane xmlns=\"http://javafx.com/javafx/8\" xmlns:fx=\"http://javafx.com/fxml/1\">\n"
+                    + "  <children>\n"
+                    + "    <ScrollPane fitToHeight=\"true\" fitToWidth=\"true\" prefHeight=\"200.0\" prefWidth=\"200.0\" AnchorPane.bottomAnchor=\"0.0\" AnchorPane.leftAnchor=\"0.0\" AnchorPane.rightAnchor=\"0.0\" AnchorPane.topAnchor=\"0.0\" BorderPane.alignment=\"CENTER\"> \n"
+                    + "      <content> \n"
+                    + "        <VBox> \n"
+                    + "          <children>");
 
             // Generates boxes
             for (int counter = 1; counter <= numberOfBoxes; counter++) {
-                writer.println("        <GridPane> \n"
-                        + "          <columnConstraints> \n"
-                        + "            <ColumnConstraints halignment=\"LEFT\" hgrow=\"SOMETIMES\" /> \n"
-                        + "            <ColumnConstraints halignment=\"RIGHT\" hgrow=\"SOMETIMES\" /> \n"
-                        + "          </columnConstraints> \n"
-                        + "          <rowConstraints>");
+                writer.println("            <GridPane> \n"
+                        + "              <columnConstraints> \n"
+                        + "                <ColumnConstraints halignment=\"LEFT\" hgrow=\"SOMETIMES\" /> \n"
+                        + "                <ColumnConstraints halignment=\"RIGHT\" hgrow=\"SOMETIMES\" /> \n"
+                        + "              </columnConstraints> \n"
+                        + "              <rowConstraints>");
 
                 // Declares necessary parameters
                 int numberOfRows = ConfigHandler.countItems("keyword[" + counter + "]", configPath);
 
                 // Writes FXML data
                 for (int i = 1; i <= numberOfRows; i++) {
-                    writer.println("            <RowConstraints maxHeight=\"20.0\" minHeight=\"20.0\" prefHeight=\"20.0\" valignment=\"CENTER\" />");
+                    writer.println("                <RowConstraints maxHeight=\"20.0\" minHeight=\"20.0\" prefHeight=\"20.0\" valignment=\"CENTER\" />");
                 }
-                writer.println("         </rowConstraints> \n"
-                        + "          <children> \n"
-                        + "            <Label text=\"" + config.getProperty("boxTitle[" + counter + "]") + "\" GridPane.columnIndex=\"0\" GridPane.rowIndex=\"0\"> \n"
-                        + "              <font> \n"
-                        + "                 <Font name=\"System Bold\" size=\"14.0\" /> \n"
-                        + "              </font> \n"
-                        + "            </Label>");
+                writer.println("             </rowConstraints> \n"
+                        + "              <children> \n"
+                        + "                <Label text=\"" + config.getProperty("boxTitle[" + counter + "]") + "\" GridPane.columnIndex=\"0\" GridPane.rowIndex=\"0\"> \n"
+                        + "                  <font> \n"
+                        + "                     <Font name=\"System Bold\" size=\"14.0\" /> \n"
+                        + "                  </font> \n"
+                        + "                </Label>");
 
                 // Writes FXML data of box content
                 for (int j = 1; j <= numberOfRows; j++) {
                     String keyword = config.getProperty("keyword[" + counter + "][" + j + "]");
-                    writer.println("            <Label text=\"" + keyword + "\" GridPane.columnIndex=\"0\" GridPane.rowIndex=\"" + j + "\"> \n"
-                            + "              <font>\n"
-                            + "                 <Font size=\"12.0\" />\n"
-                            + "              </font>\n"
-                            + "            </Label>\n"
-                            + "            <Label fx:id=\"label" + keyword + "\" GridPane.columnIndex=\"1\" GridPane.rowIndex=\"" + j + "\"> \n"
-                            + "              <font>\n"
-                            + "                 <Font size=\"12.0\" />\n"
-                            + "              </font>\n"
-                            + "            </Label>");
+                    writer.println("                <Label text=\"" + keyword + ":\" GridPane.columnIndex=\"0\" GridPane.rowIndex=\"" + j + "\"> \n"
+                            + "                  <font>\n"
+                            + "                     <Font size=\"12.0\" />\n"
+                            + "                  </font>\n"
+                            + "                </Label>\n"
+                            + "                <Label fx:id=\"label" + keyword + "\" GridPane.columnIndex=\"1\" GridPane.rowIndex=\"" + j + "\"> \n"
+                            + "                  <font>\n"
+                            + "                     <Font size=\"12.0\" />\n"
+                            + "                  </font>\n"
+                            + "                </Label>");
                 }
-                writer.println("          </children> \n"
-                        + "          <padding> \n"
-                        + "            <Insets bottom=\"20.0\" /> \n"
-                        + "          </padding> \n"
-                        + "        </GridPane>");
+                writer.println("              </children> \n"
+                        + "              <padding> \n"
+                        + "                <Insets bottom=\"20.0\" /> \n"
+                        + "              </padding> \n"
+                        + "            </GridPane>");
             }
-            writer.println("      </children> \n"
-                    + "    </VBox> \n"
-                    + "  </content> \n"
-                    + "</ScrollPane>");
+            writer.println("          </children> \n"
+                    + "        </VBox> \n"
+                    + "      </content> \n"
+                    + "      <padding> \n"
+                    + "        <Insets bottom=\"10.0\" left=\"7.0\" right=\"7.0\" top=\"10.0\" /> \n"
+                    + "      </padding> \n"
+                    + "    </ScrollPane> \n"
+                    + "  </children> \n"
+                    + "</AnchorPane>");
         } else {
             writer.println("");
         }
diff --git a/Universal-Space-Operations-Center/src/main/java/com/ksatstuttgart/usoc/gui/controller/LogPanelController.java b/Universal-Space-Operations-Center/src/main/java/com/ksatstuttgart/usoc/gui/controller/LogPanelController.java
index 1253dca..d8a181e 100644
--- a/Universal-Space-Operations-Center/src/main/java/com/ksatstuttgart/usoc/gui/controller/LogPanelController.java
+++ b/Universal-Space-Operations-Center/src/main/java/com/ksatstuttgart/usoc/gui/controller/LogPanelController.java
@@ -1,23 +1,31 @@
-package com.ksatstuttgart.usoc.gui.controller; 
+package com.ksatstuttgart.usoc.gui.controller;
 
-import java.net.URL; 
-import java.util.ResourceBundle; 
-import javafx.event.ActionEvent; 
-import javafx.fxml.FXML; 
-import com.ksatstuttgart.usoc.controller.communication.SerialComm;
-import com.ksatstuttgart.usoc.controller.communication.MailReceiver;
+import java.net.URL;
+import java.util.ResourceBundle;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.fxml.Initializable;
+
+// Imports for serialLog or iridiumLog
 import com.ksatstuttgart.usoc.controller.MainController;
-import java.util.ArrayList;
 import com.ksatstuttgart.usoc.controller.MessageController;
 import com.ksatstuttgart.usoc.data.DataSource;
 import com.ksatstuttgart.usoc.data.ErrorEvent;
-import com.ksatstuttgart.usoc.data.MailEvent;
-import com.ksatstuttgart.usoc.data.SerialEvent;
 import com.ksatstuttgart.usoc.data.USOCEvent;
-import javafx.fxml.Initializable; 
-import javafx.scene.control.ComboBox; 
 import javafx.scene.control.TextArea;
-import javax.mail.Address; 
+
+// Specific imports for serialLog
+import com.ksatstuttgart.usoc.controller.communication.SerialComm;
+import java.util.ArrayList;
+import com.ksatstuttgart.usoc.data.SerialEvent;
+import javafx.scene.control.ComboBox;
+
+// Specific imports for iridiumLog
+import com.ksatstuttgart.usoc.controller.communication.MailReceiver;
+import com.ksatstuttgart.usoc.data.MailEvent;
+import java.util.Date;
+import javafx.scene.control.Label;
+import javax.mail.Address;
 
 /** 
  * 
@@ -60,6 +68,10 @@ private void serialSendCommand(ActionEvent event) {
     } 
 
     @FXML private TextArea iridiumTextArea; 
+    @FXML private Label iridiumLastFrom; 
+    @FXML private Label iridiumLastSubject; 
+    @FXML private Label iridiumLastFilename; 
+    @FXML private Label iridiumLastTimestamp; 
 
     @FXML 
     private void iridiumOpen(ActionEvent event) { 
@@ -85,6 +97,34 @@ private void iridiumReconnect(ActionEvent event) {
         MailReceiver.getInstance().reconnect(); 
     } 
 
+    @Override
+    public void updateData(MessageController msgController, USOCEvent ue) {
+        if (ue instanceof MailEvent) {
+            MailEvent e = (MailEvent) ue;
+            String s = "";
+            for (Address from : e.getFrom()) {
+                s += "," + from.toString();
+            }
+            //Setting label texts
+            iridiumLastFrom.setText(s.substring(1));
+            iridiumLastSubject.setText(e.getSubject());
+            iridiumLastFilename.setText(e.getFilename());
+            iridiumLastTimestamp.setText(new Date(e.getTimeStampGmail()).toString());
+            iridiumTextArea.setText(msgController.getData().toString());
+        } else if (ue instanceof SerialEvent) {
+            serialTextArea.setText(((SerialEvent)ue).getMsg());
+        } else if (ue instanceof ErrorEvent) {
+            if (DataSource.MAIL == ue.getDataSource()) {
+                iridiumTextArea.setText(((ErrorEvent) ue).getErrorMessage());
+            } else if (DataSource.SERIAL == ue.getDataSource()) {
+                serialTextArea.setText(((ErrorEvent) ue).getErrorMessage());
+            }
+        } else {
+            serialTextArea.setText(msgController.getData().toString());
+            iridiumTextArea.setText(msgController.getData().toString());
+        }
+    }
+
     @FXML 
     private void button11(ActionEvent event) { 
         // Automatically generated method button11() 
@@ -109,41 +149,11 @@ private void button26(ActionEvent event) {
         System.out.println("Button26 was pressed!"); 
     } 
 
-    @Override
-    public void updateData(MessageController msgController, USOCEvent ue) {
-        if (ue instanceof MailEvent) {
-            MailEvent e = (MailEvent) ue;
-            String s = "";
-            for (Address from : e.getFrom()) {
-                s += "," + from.toString();
-            }
-            //Setting label texts
-            //lastFrom.setText(s.substring(1));
-            //lastSubject.setText(e.getSubject());
-            //lastFilename.setText(e.getFilename());
-            //lastTimestamp.setText(new Date(e.getTimeStampGmail()).toString());
-
-            //TODO: change this to iridiumTextArea
-            serialTextArea.setText(msgController.getData().toString());
-        } else if (ue instanceof SerialEvent) {
-            serialTextArea.setText(((SerialEvent)ue).getMsg());
-        } else if (ue instanceof ErrorEvent) {
-            if (DataSource.MAIL == ue.getDataSource()) {
-                //TODO: change this to iridiumTextArea
-                serialTextArea.setText(((ErrorEvent) ue).getErrorMessage());
-            } else if (DataSource.SERIAL == ue.getDataSource()) {
-                serialTextArea.setText(((ErrorEvent) ue).getErrorMessage());
-            }
-        } else {
-            serialTextArea.setText(msgController.getData().toString());
-        }
-    }
-
     @Override 
     public void initialize(URL url, ResourceBundle rb) { 
-        // TODO 
+        // TODO
         MainController.startPortThread(this);
         MainController.getInstance().addDataUpdateListener(new UpdateListener());
-        setData(); 
+        setData();
     } 
 }
diff --git a/Universal-Space-Operations-Center/src/main/java/com/ksatstuttgart/usoc/gui/controller/MainPanelController.java b/Universal-Space-Operations-Center/src/main/java/com/ksatstuttgart/usoc/gui/controller/MainPanelController.java
index 9647d50..e85de2c 100644
--- a/Universal-Space-Operations-Center/src/main/java/com/ksatstuttgart/usoc/gui/controller/MainPanelController.java
+++ b/Universal-Space-Operations-Center/src/main/java/com/ksatstuttgart/usoc/gui/controller/MainPanelController.java
@@ -9,6 +9,7 @@
 import com.ksatstuttgart.usoc.data.message.Var;
 import com.ksatstuttgart.usoc.data.message.dataPackage.Sensor;
 import java.util.ResourceBundle;
+import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.scene.chart.LineChart;
 import javafx.scene.chart.XYChart;
diff --git a/Universal-Space-Operations-Center/src/main/java/com/ksatstuttgart/usoc/gui/controller/StatePanelController.java b/Universal-Space-Operations-Center/src/main/java/com/ksatstuttgart/usoc/gui/controller/StatePanelController.java
index 7bf6f23..6bf90f0 100644
--- a/Universal-Space-Operations-Center/src/main/java/com/ksatstuttgart/usoc/gui/controller/StatePanelController.java
+++ b/Universal-Space-Operations-Center/src/main/java/com/ksatstuttgart/usoc/gui/controller/StatePanelController.java
@@ -19,8 +19,8 @@ public class StatePanelController implements Initializable {
     @FXML Label labelExecution;
     @FXML Label labelObservation;
     @FXML Label labelDiagnosis;
-    @FXML Label labeltest1;
-    @FXML Label labeltest2;
+    @FXML Label labelTestLabel1;
+    @FXML Label labelTestLabel2;
 
     public void updateStates() {
         labelSafe.setText("labelSafe");
@@ -29,8 +29,8 @@ public void updateStates() {
         labelExecution.setText("labelExecution");
         labelObservation.setText("labelObservation");
         labelDiagnosis.setText("labelDiagnosis");
-        labeltest1.setText("labeltest1");
-        labeltest2.setText("labeltest2");
+        labelTestLabel1.setText("labelTestLabel1");
+        labelTestLabel2.setText("labelTestLabel2");
     }
 
     @Override 
diff --git a/Universal-Space-Operations-Center/src/main/resources/config/config.properties b/Universal-Space-Operations-Center/src/main/resources/config/config.properties
index fe4a703..8a49b28 100644
--- a/Universal-Space-Operations-Center/src/main/resources/config/config.properties
+++ b/Universal-Space-Operations-Center/src/main/resources/config/config.properties
@@ -48,7 +48,7 @@ GNSS3dView          =   true
 # Name of experiment the ground station is used for
 # Mandatory: YES
 # Expected input: String
-experimentName      =   MIRKA2-RX
+experimentName      =   MIRKA2-ICV
 
 
 
@@ -156,12 +156,12 @@ control[2][6]           =   button
 boxTitle[1]             =   Mode
 boxTitle[2]             =   Test
 #
-# Configurtion of boxes
+# Configurtion of the labels
 keyword[1][1]           =   Safe
 keyword[1][2]           =   Idle
 keyword[1][3]           =   Preparation
 keyword[1][4]           =   Execution
 keyword[1][5]           =   Observation
 keyword[1][6]           =   Diagnosis
-keyword[2][1]           =   test1
-keyword[2][2]           =   test2
\ No newline at end of file
+keyword[2][1]           =   TestLabel1
+keyword[2][2]           =   TestLabel2
\ No newline at end of file
diff --git a/Universal-Space-Operations-Center/src/main/resources/config/configMod.properties b/Universal-Space-Operations-Center/src/main/resources/config/configMod.properties
index 8fff6ad..3c0eb77 100644
--- a/Universal-Space-Operations-Center/src/main/resources/config/configMod.properties
+++ b/Universal-Space-Operations-Center/src/main/resources/config/configMod.properties
@@ -4,30 +4,28 @@
 # and modifications are not intended!
 -- listing properties --
 keyword[1][6]=Diagnosis
-keyword[2][2]=test
+keyword[2][2]=TestLabel2
 serialPanel=true
-boxTitle[1]=MODE
+boxTitle[1]=Mode
 control[1][1]=button
 control[1][4]=button
 x[3]=Time [s]
-x[6]=Time [s]
 control[2][3]=textField
 promptText[2][3]=Prompt Text 2
 control[2][6]=button
-y[1]=Current [A]
+y[1]=Temperature [°C]
 bText[1][1]=Button 1
 textArea[2]=false
-y[4]=Current [A]
+y[4]=Voltage [V]
 bText[1][4]=Button 2
 lText[1][2]=Label 1
 bText[2][6]=Text
 lText[2][4]=Label 2
 keyword[1][2]=Idle
-chartTitle[3]=Chart 3
+chartTitle[3]=Time Signal
 keyword[1][5]=Observation
-chartTitle[6]=Chart 6
-keyword[2][1]=test
-statePanel=false
+keyword[2][1]=TestLabel1
+statePanel=true
 control[1][3]=textField
 x[2]=Time [s]
 promptText[1][3]=Prompt Text 1
@@ -36,26 +34,25 @@ control[2][2]=label
 control[2][5]=textField
 promptText[2][5]=Prompt Text 3
 textArea[1]=true
-y[3]=Height [m]
-y[6]=Height [m]
-GNSS3dView=false
-experimentName=PAPELL
+y[3]=Time
+GNSS3dView=true
+experimentName=MIRKA2-ICV
 iridiumPanel=true
 keyword[1][1]=Safe
-chartTitle[2]=Chart 2
+chartTitle[2]=Pressuresensors
 keyword[1][4]=Execution
-chartTitle[5]=Chart 5
+chartTitle[5]=IMU
 boxTitle[2]=Test
 control[1][2]=label
 x[1]=Time [s]
 x[4]=Time [s]
 control[2][1]=button
 control[2][4]=label
-y[2]=Power [W]
-y[5]=Power [W]
+y[2]=Pressure [kPa]
+y[5]=Quaternions
 RESET=false
 bText[2][1]=Button 3
 lText[2][2]=Label 2
-chartTitle[1]=Chart 1
+chartTitle[1]=Thermocouples
 keyword[1][3]=Preparation
-chartTitle[4]=Chart 4
+chartTitle[4]=Battery Voltage
diff --git a/Universal-Space-Operations-Center/src/main/resources/fxml/LogPanel.fxml b/Universal-Space-Operations-Center/src/main/resources/fxml/LogPanel.fxml
index 61853e7..b46d1a8 100644
--- a/Universal-Space-Operations-Center/src/main/resources/fxml/LogPanel.fxml
+++ b/Universal-Space-Operations-Center/src/main/resources/fxml/LogPanel.fxml
@@ -58,50 +58,48 @@
     <Tab text="Iridium"> 
       <content> 
 
-<BorderPane>
-<padding><Insets top="5" right="5" bottom="5" left="5"/></padding>
-  <top>
-    <GridPane alignment="TOP_CENTER" BorderPane.alignment="CENTER">
-    <padding><Insets bottom="5" /></padding>
-      <columnConstraints>
-        <ColumnConstraints hgrow="SOMETIMES" />
-        <ColumnConstraints hgrow="SOMETIMES" maxWidth="120.0" prefWidth="90.0" />
-      </columnConstraints>
-      <rowConstraints>
-        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-
-      </rowConstraints>
-      <children>
-        <Label text="Last message from:" GridPane.columnIndex="0" GridPane.rowIndex="0" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
-        <Label text="Subject:" GridPane.columnIndex="0" GridPane.rowIndex="1" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
-        <Label text="Filename:" GridPane.columnIndex="0" GridPane.rowIndex="2" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
-        <Label text="Received at:" GridPane.columnIndex="0" GridPane.rowIndex="3" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
-        <Label text="Add file:" GridPane.columnIndex="0" GridPane.rowIndex="4" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
-        <Button text="Clear Data" onAction="#iridiumClearData" GridPane.columnIndex="0" GridPane.rowIndex="5" prefWidth="90.0" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
-        <Label text="#Masseges on reconnect:" GridPane.columnIndex="0" GridPane.rowIndex="6" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
-        <Button text="exportCSV" onAction="#iridiumExportCSV" GridPane.columnIndex="0" GridPane.rowIndex="7" prefWidth="90.0" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
-        <Label text="Label1" fx:id="iridiumLastMessage" GridPane.columnIndex="1" GridPane.rowIndex="0" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
-        <Label text="Label2" fx:id="iridiumSubject" GridPane.columnIndex="1" GridPane.rowIndex="1" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
-        <Label text="Label3" fx:id="iridiumFilename" GridPane.columnIndex="1" GridPane.rowIndex="2" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
-        <Label text="Label4" fx:id="iridiumReceived" GridPane.columnIndex="1" GridPane.rowIndex="3" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
-        <Button text="Open" onAction="#iridiumOpen" GridPane.columnIndex="1" GridPane.rowIndex="4" prefWidth="60.0" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
-        <TextField text="0" GridPane.columnIndex="1" GridPane.rowIndex="6" GridPane.halignment="RIGHT" maxWidth="60.0" prefWidth="60.0" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
-        <Button text="Reconnect" onAction="#iridiumReconnect" GridPane.columnIndex="1" GridPane.rowIndex="7" prefWidth="90.0" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
-        
-      </children>
-    </GridPane>
-  </top>
-  <center>
-    <TextArea prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER" />
-  </center>
-</BorderPane>
+        <BorderPane>
+        <padding><Insets top="5" right="5" bottom="5" left="5"/></padding>
+          <top>
+            <GridPane alignment="TOP_CENTER" BorderPane.alignment="CENTER">
+            <padding><Insets bottom="5" /></padding>
+              <columnConstraints>
+                <ColumnConstraints hgrow="SOMETIMES" />
+                <ColumnConstraints hgrow="SOMETIMES" maxWidth="120.0" prefWidth="90.0" />
+              </columnConstraints>
+              <rowConstraints>
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+              </rowConstraints>
+              <children>
+                <Label text="Last message from:" GridPane.columnIndex="0" GridPane.rowIndex="0" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+                <Label text="Subject:" GridPane.columnIndex="0" GridPane.rowIndex="1" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+                <Label text="Filename:" GridPane.columnIndex="0" GridPane.rowIndex="2" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+                <Label text="Received at:" GridPane.columnIndex="0" GridPane.rowIndex="3" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+                <Label text="Add file:" GridPane.columnIndex="0" GridPane.rowIndex="4" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+                <Button text="Clear Data" onAction="#iridiumClearData" GridPane.columnIndex="0" GridPane.rowIndex="5" prefWidth="90.0" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+                <Label text="#Masseges on reconnect:" GridPane.columnIndex="0" GridPane.rowIndex="6" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+                <Button text="exportCSV" onAction="#iridiumExportCSV" GridPane.columnIndex="0" GridPane.rowIndex="7" prefWidth="90.0" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+                <Label fx:id="iridiumLastFrom" GridPane.columnIndex="1" GridPane.rowIndex="0" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+                <Label fx:id="iridiumLastSubject" GridPane.columnIndex="1" GridPane.rowIndex="1" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+                <Label fx:id="iridiumLastFilename" GridPane.columnIndex="1" GridPane.rowIndex="2" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+                <Label fx:id="iridiumLastTimestamp" GridPane.columnIndex="1" GridPane.rowIndex="3" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+                <Button text="Open" onAction="#iridiumOpen" GridPane.columnIndex="1" GridPane.rowIndex="4" prefWidth="60.0" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+                <TextField text="0" GridPane.columnIndex="1" GridPane.rowIndex="6" GridPane.halignment="RIGHT" maxWidth="60.0" prefWidth="60.0" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+                <Button text="Reconnect" onAction="#iridiumReconnect" GridPane.columnIndex="1" GridPane.rowIndex="7" prefWidth="90.0" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+              </children>
+            </GridPane>
+          </top>
+          <center>
+            <TextArea fx:id="iridiumTextArea" prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER" />
+          </center>
+        </BorderPane>
 
       </content> 
     </Tab>
@@ -110,20 +108,20 @@
 <BorderPane> 
 <padding><Insets top="5" right="5" bottom="5" left="5"/></padding> 
   <top> 
-    <GridPane> 
+    <GridPane alignment="TOP_CENTER" BorderPane.alignment="CENTER">
       <columnConstraints> 
-        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> 
-        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> 
+        <ColumnConstraints hgrow="SOMETIMES" /> 
+        <ColumnConstraints hgrow="SOMETIMES" /> 
       </columnConstraints> 
       <rowConstraints>
         <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
         <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
      </rowConstraints> 
       <children>
-        <Button text="Button 1" onAction="#button11" mnemonicParsing="false" GridPane.columnIndex="0" GridPane.rowIndex="0" />
-        <Label text="Label 1" GridPane.columnIndex="1" GridPane.rowIndex="0" />
-        <TextField promptText="Prompt Text 1" GridPane.columnIndex="0" GridPane.rowIndex="1" />
-        <Button text="Button 2" onAction="#button14" mnemonicParsing="false" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+        <Button text="Button 1" onAction="#button11" mnemonicParsing="false" GridPane.columnIndex="0" GridPane.rowIndex="0" maxWidth="-Infinity" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES"/>
+        <Label text="Label 1" GridPane.columnIndex="1" GridPane.rowIndex="0" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+        <TextField promptText="Prompt Text 1" GridPane.columnIndex="0" GridPane.rowIndex="1" GridPane.halignment="RIGHT" maxWidth="60.0" prefWidth="60.0" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+        <Button text="Button 2" onAction="#button14" mnemonicParsing="false" GridPane.columnIndex="1" GridPane.rowIndex="1" maxWidth="-Infinity" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES"/>
       </children> 
     </GridPane> 
   </top>
@@ -138,10 +136,10 @@
 <BorderPane> 
 <padding><Insets top="5" right="5" bottom="5" left="5"/></padding> 
   <top> 
-    <GridPane> 
+    <GridPane alignment="TOP_CENTER" BorderPane.alignment="CENTER">
       <columnConstraints> 
-        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> 
-        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> 
+        <ColumnConstraints hgrow="SOMETIMES" /> 
+        <ColumnConstraints hgrow="SOMETIMES" /> 
       </columnConstraints> 
       <rowConstraints>
         <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
@@ -149,12 +147,12 @@
         <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
      </rowConstraints> 
       <children>
-        <Button text="Button 3" onAction="#button21" mnemonicParsing="false" GridPane.columnIndex="0" GridPane.rowIndex="0" />
-        <Label text="Label 2" GridPane.columnIndex="1" GridPane.rowIndex="0" />
-        <TextField promptText="Prompt Text 2" GridPane.columnIndex="0" GridPane.rowIndex="1" />
-        <Label text="Label 2" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-        <TextField promptText="Prompt Text 3" GridPane.columnIndex="0" GridPane.rowIndex="2" />
-        <Button text="Text" onAction="#button26" mnemonicParsing="false" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+        <Button text="Button 3" onAction="#button21" mnemonicParsing="false" GridPane.columnIndex="0" GridPane.rowIndex="0" maxWidth="-Infinity" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES"/>
+        <Label text="Label 2" GridPane.columnIndex="1" GridPane.rowIndex="0" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+        <TextField promptText="Prompt Text 2" GridPane.columnIndex="0" GridPane.rowIndex="1" GridPane.halignment="RIGHT" maxWidth="60.0" prefWidth="60.0" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+        <Label text="Label 2" GridPane.columnIndex="1" GridPane.rowIndex="1" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+        <TextField promptText="Prompt Text 3" GridPane.columnIndex="0" GridPane.rowIndex="2" GridPane.halignment="RIGHT" maxWidth="60.0" prefWidth="60.0" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+        <Button text="Text" onAction="#button26" mnemonicParsing="false" GridPane.columnIndex="1" GridPane.rowIndex="2" maxWidth="-Infinity" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES"/>
       </children> 
     </GridPane> 
   </top>
diff --git a/Universal-Space-Operations-Center/src/main/resources/fxml/StatePanel.fxml b/Universal-Space-Operations-Center/src/main/resources/fxml/StatePanel.fxml
index 5b4e362..194ae09 100644
--- a/Universal-Space-Operations-Center/src/main/resources/fxml/StatePanel.fxml
+++ b/Universal-Space-Operations-Center/src/main/resources/fxml/StatePanel.fxml
@@ -3,135 +3,142 @@
 <?import javafx.scene.layout.*?> 
 <?import javafx.geometry.*?> 
 
-<ScrollPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fitToHeight="true" fitToWidth="true" prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER"> 
-  <content> 
-    <VBox> 
-      <children>
-        <GridPane> 
-          <columnConstraints> 
-            <ColumnConstraints halignment="LEFT" hgrow="SOMETIMES" /> 
-            <ColumnConstraints halignment="RIGHT" hgrow="SOMETIMES" /> 
-          </columnConstraints> 
-          <rowConstraints>
-            <RowConstraints maxHeight="20.0" minHeight="20.0" prefHeight="20.0" valignment="CENTER" />
-            <RowConstraints maxHeight="20.0" minHeight="20.0" prefHeight="20.0" valignment="CENTER" />
-            <RowConstraints maxHeight="20.0" minHeight="20.0" prefHeight="20.0" valignment="CENTER" />
-            <RowConstraints maxHeight="20.0" minHeight="20.0" prefHeight="20.0" valignment="CENTER" />
-            <RowConstraints maxHeight="20.0" minHeight="20.0" prefHeight="20.0" valignment="CENTER" />
-            <RowConstraints maxHeight="20.0" minHeight="20.0" prefHeight="20.0" valignment="CENTER" />
-         </rowConstraints> 
-          <children> 
-            <Label text="Mode" GridPane.columnIndex="0" GridPane.rowIndex="0"> 
-              <font> 
-                 <Font name="System Bold" size="14.0" /> 
-              </font> 
-            </Label>
-            <Label text="Safe" GridPane.columnIndex="0" GridPane.rowIndex="1"> 
-              <font>
-                 <Font size="12.0" />
-              </font>
-            </Label>
-            <Label fx:id="labelSafe" GridPane.columnIndex="1" GridPane.rowIndex="1"> 
-              <font>
-                 <Font size="12.0" />
-              </font>
-            </Label>
-            <Label text="Idle" GridPane.columnIndex="0" GridPane.rowIndex="2"> 
-              <font>
-                 <Font size="12.0" />
-              </font>
-            </Label>
-            <Label fx:id="labelIdle" GridPane.columnIndex="1" GridPane.rowIndex="2"> 
-              <font>
-                 <Font size="12.0" />
-              </font>
-            </Label>
-            <Label text="Preparation" GridPane.columnIndex="0" GridPane.rowIndex="3"> 
-              <font>
-                 <Font size="12.0" />
-              </font>
-            </Label>
-            <Label fx:id="labelPreparation" GridPane.columnIndex="1" GridPane.rowIndex="3"> 
-              <font>
-                 <Font size="12.0" />
-              </font>
-            </Label>
-            <Label text="Execution" GridPane.columnIndex="0" GridPane.rowIndex="4"> 
-              <font>
-                 <Font size="12.0" />
-              </font>
-            </Label>
-            <Label fx:id="labelExecution" GridPane.columnIndex="1" GridPane.rowIndex="4"> 
-              <font>
-                 <Font size="12.0" />
-              </font>
-            </Label>
-            <Label text="Observation" GridPane.columnIndex="0" GridPane.rowIndex="5"> 
-              <font>
-                 <Font size="12.0" />
-              </font>
-            </Label>
-            <Label fx:id="labelObservation" GridPane.columnIndex="1" GridPane.rowIndex="5"> 
-              <font>
-                 <Font size="12.0" />
-              </font>
-            </Label>
-            <Label text="Diagnosis" GridPane.columnIndex="0" GridPane.rowIndex="6"> 
-              <font>
-                 <Font size="12.0" />
-              </font>
-            </Label>
-            <Label fx:id="labelDiagnosis" GridPane.columnIndex="1" GridPane.rowIndex="6"> 
-              <font>
-                 <Font size="12.0" />
-              </font>
-            </Label>
+<AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+  <children>
+    <ScrollPane fitToHeight="true" fitToWidth="true" prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" BorderPane.alignment="CENTER"> 
+      <content> 
+        <VBox> 
+          <children>
+            <GridPane> 
+              <columnConstraints> 
+                <ColumnConstraints halignment="LEFT" hgrow="SOMETIMES" /> 
+                <ColumnConstraints halignment="RIGHT" hgrow="SOMETIMES" /> 
+              </columnConstraints> 
+              <rowConstraints>
+                <RowConstraints maxHeight="20.0" minHeight="20.0" prefHeight="20.0" valignment="CENTER" />
+                <RowConstraints maxHeight="20.0" minHeight="20.0" prefHeight="20.0" valignment="CENTER" />
+                <RowConstraints maxHeight="20.0" minHeight="20.0" prefHeight="20.0" valignment="CENTER" />
+                <RowConstraints maxHeight="20.0" minHeight="20.0" prefHeight="20.0" valignment="CENTER" />
+                <RowConstraints maxHeight="20.0" minHeight="20.0" prefHeight="20.0" valignment="CENTER" />
+                <RowConstraints maxHeight="20.0" minHeight="20.0" prefHeight="20.0" valignment="CENTER" />
+             </rowConstraints> 
+              <children> 
+                <Label text="Mode" GridPane.columnIndex="0" GridPane.rowIndex="0"> 
+                  <font> 
+                     <Font name="System Bold" size="14.0" /> 
+                  </font> 
+                </Label>
+                <Label text="Safe:" GridPane.columnIndex="0" GridPane.rowIndex="1"> 
+                  <font>
+                     <Font size="12.0" />
+                  </font>
+                </Label>
+                <Label fx:id="labelSafe" GridPane.columnIndex="1" GridPane.rowIndex="1"> 
+                  <font>
+                     <Font size="12.0" />
+                  </font>
+                </Label>
+                <Label text="Idle:" GridPane.columnIndex="0" GridPane.rowIndex="2"> 
+                  <font>
+                     <Font size="12.0" />
+                  </font>
+                </Label>
+                <Label fx:id="labelIdle" GridPane.columnIndex="1" GridPane.rowIndex="2"> 
+                  <font>
+                     <Font size="12.0" />
+                  </font>
+                </Label>
+                <Label text="Preparation:" GridPane.columnIndex="0" GridPane.rowIndex="3"> 
+                  <font>
+                     <Font size="12.0" />
+                  </font>
+                </Label>
+                <Label fx:id="labelPreparation" GridPane.columnIndex="1" GridPane.rowIndex="3"> 
+                  <font>
+                     <Font size="12.0" />
+                  </font>
+                </Label>
+                <Label text="Execution:" GridPane.columnIndex="0" GridPane.rowIndex="4"> 
+                  <font>
+                     <Font size="12.0" />
+                  </font>
+                </Label>
+                <Label fx:id="labelExecution" GridPane.columnIndex="1" GridPane.rowIndex="4"> 
+                  <font>
+                     <Font size="12.0" />
+                  </font>
+                </Label>
+                <Label text="Observation:" GridPane.columnIndex="0" GridPane.rowIndex="5"> 
+                  <font>
+                     <Font size="12.0" />
+                  </font>
+                </Label>
+                <Label fx:id="labelObservation" GridPane.columnIndex="1" GridPane.rowIndex="5"> 
+                  <font>
+                     <Font size="12.0" />
+                  </font>
+                </Label>
+                <Label text="Diagnosis:" GridPane.columnIndex="0" GridPane.rowIndex="6"> 
+                  <font>
+                     <Font size="12.0" />
+                  </font>
+                </Label>
+                <Label fx:id="labelDiagnosis" GridPane.columnIndex="1" GridPane.rowIndex="6"> 
+                  <font>
+                     <Font size="12.0" />
+                  </font>
+                </Label>
+              </children> 
+              <padding> 
+                <Insets bottom="20.0" /> 
+              </padding> 
+            </GridPane>
+            <GridPane> 
+              <columnConstraints> 
+                <ColumnConstraints halignment="LEFT" hgrow="SOMETIMES" /> 
+                <ColumnConstraints halignment="RIGHT" hgrow="SOMETIMES" /> 
+              </columnConstraints> 
+              <rowConstraints>
+                <RowConstraints maxHeight="20.0" minHeight="20.0" prefHeight="20.0" valignment="CENTER" />
+                <RowConstraints maxHeight="20.0" minHeight="20.0" prefHeight="20.0" valignment="CENTER" />
+             </rowConstraints> 
+              <children> 
+                <Label text="Test" GridPane.columnIndex="0" GridPane.rowIndex="0"> 
+                  <font> 
+                     <Font name="System Bold" size="14.0" /> 
+                  </font> 
+                </Label>
+                <Label text="TestLabel1:" GridPane.columnIndex="0" GridPane.rowIndex="1"> 
+                  <font>
+                     <Font size="12.0" />
+                  </font>
+                </Label>
+                <Label fx:id="labelTestLabel1" GridPane.columnIndex="1" GridPane.rowIndex="1"> 
+                  <font>
+                     <Font size="12.0" />
+                  </font>
+                </Label>
+                <Label text="TestLabel2:" GridPane.columnIndex="0" GridPane.rowIndex="2"> 
+                  <font>
+                     <Font size="12.0" />
+                  </font>
+                </Label>
+                <Label fx:id="labelTestLabel2" GridPane.columnIndex="1" GridPane.rowIndex="2"> 
+                  <font>
+                     <Font size="12.0" />
+                  </font>
+                </Label>
+              </children> 
+              <padding> 
+                <Insets bottom="20.0" /> 
+              </padding> 
+            </GridPane>
           </children> 
-          <padding> 
-            <Insets bottom="20.0" /> 
-          </padding> 
-        </GridPane>
-        <GridPane> 
-          <columnConstraints> 
-            <ColumnConstraints halignment="LEFT" hgrow="SOMETIMES" /> 
-            <ColumnConstraints halignment="RIGHT" hgrow="SOMETIMES" /> 
-          </columnConstraints> 
-          <rowConstraints>
-            <RowConstraints maxHeight="20.0" minHeight="20.0" prefHeight="20.0" valignment="CENTER" />
-            <RowConstraints maxHeight="20.0" minHeight="20.0" prefHeight="20.0" valignment="CENTER" />
-         </rowConstraints> 
-          <children> 
-            <Label text="Test" GridPane.columnIndex="0" GridPane.rowIndex="0"> 
-              <font> 
-                 <Font name="System Bold" size="14.0" /> 
-              </font> 
-            </Label>
-            <Label text="test1" GridPane.columnIndex="0" GridPane.rowIndex="1"> 
-              <font>
-                 <Font size="12.0" />
-              </font>
-            </Label>
-            <Label fx:id="labeltest1" GridPane.columnIndex="1" GridPane.rowIndex="1"> 
-              <font>
-                 <Font size="12.0" />
-              </font>
-            </Label>
-            <Label text="test2" GridPane.columnIndex="0" GridPane.rowIndex="2"> 
-              <font>
-                 <Font size="12.0" />
-              </font>
-            </Label>
-            <Label fx:id="labeltest2" GridPane.columnIndex="1" GridPane.rowIndex="2"> 
-              <font>
-                 <Font size="12.0" />
-              </font>
-            </Label>
-          </children> 
-          <padding> 
-            <Insets bottom="20.0" /> 
-          </padding> 
-        </GridPane>
-      </children> 
-    </VBox> 
-  </content> 
-</ScrollPane>
+        </VBox> 
+      </content> 
+      <padding> 
+        <Insets bottom="10.0" left="7.0" right="7.0" top="10.0" /> 
+      </padding> 
+    </ScrollPane> 
+  </children> 
+</AnchorPane>
diff --git a/Universal-Space-Operations-Center/src/main/resources/fxml/logTabs/IridiumPanel.fxml b/Universal-Space-Operations-Center/src/main/resources/fxml/logTabs/IridiumPanel.fxml
index 896cf1d..c8683f0 100644
--- a/Universal-Space-Operations-Center/src/main/resources/fxml/logTabs/IridiumPanel.fxml
+++ b/Universal-Space-Operations-Center/src/main/resources/fxml/logTabs/IridiumPanel.fxml
@@ -1,44 +1,42 @@
-<BorderPane>
-<padding><Insets top="5" right="5" bottom="5" left="5"/></padding>
-  <top>
-    <GridPane alignment="TOP_CENTER" BorderPane.alignment="CENTER">
-    <padding><Insets bottom="5" /></padding>
-      <columnConstraints>
-        <ColumnConstraints hgrow="SOMETIMES" />
-        <ColumnConstraints hgrow="SOMETIMES" maxWidth="120.0" prefWidth="90.0" />
-      </columnConstraints>
-      <rowConstraints>
-        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-
-      </rowConstraints>
-      <children>
-        <Label text="Last message from:" GridPane.columnIndex="0" GridPane.rowIndex="0" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
-        <Label text="Subject:" GridPane.columnIndex="0" GridPane.rowIndex="1" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
-        <Label text="Filename:" GridPane.columnIndex="0" GridPane.rowIndex="2" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
-        <Label text="Received at:" GridPane.columnIndex="0" GridPane.rowIndex="3" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
-        <Label text="Add file:" GridPane.columnIndex="0" GridPane.rowIndex="4" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
-        <Button text="Clear Data" onAction="#iridiumClearData" GridPane.columnIndex="0" GridPane.rowIndex="5" prefWidth="90.0" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
-        <Label text="#Masseges on reconnect:" GridPane.columnIndex="0" GridPane.rowIndex="6" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
-        <Button text="exportCSV" onAction="#iridiumExportCSV" GridPane.columnIndex="0" GridPane.rowIndex="7" prefWidth="90.0" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
-        <Label text="Label1" fx:id="iridiumLastMessage" GridPane.columnIndex="1" GridPane.rowIndex="0" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
-        <Label text="Label2" fx:id="iridiumSubject" GridPane.columnIndex="1" GridPane.rowIndex="1" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
-        <Label text="Label3" fx:id="iridiumFilename" GridPane.columnIndex="1" GridPane.rowIndex="2" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
-        <Label text="Label4" fx:id="iridiumReceived" GridPane.columnIndex="1" GridPane.rowIndex="3" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
-        <Button text="Open" onAction="#iridiumOpen" GridPane.columnIndex="1" GridPane.rowIndex="4" prefWidth="60.0" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
-        <TextField text="0" GridPane.columnIndex="1" GridPane.rowIndex="6" GridPane.halignment="RIGHT" maxWidth="60.0" prefWidth="60.0" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
-        <Button text="Reconnect" onAction="#iridiumReconnect" GridPane.columnIndex="1" GridPane.rowIndex="7" prefWidth="90.0" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
-        
-      </children>
-    </GridPane>
-  </top>
-  <center>
-    <TextArea prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER" />
-  </center>
-</BorderPane>
\ No newline at end of file
+        <BorderPane>
+        <padding><Insets top="5" right="5" bottom="5" left="5"/></padding>
+          <top>
+            <GridPane alignment="TOP_CENTER" BorderPane.alignment="CENTER">
+            <padding><Insets bottom="5" /></padding>
+              <columnConstraints>
+                <ColumnConstraints hgrow="SOMETIMES" />
+                <ColumnConstraints hgrow="SOMETIMES" maxWidth="120.0" prefWidth="90.0" />
+              </columnConstraints>
+              <rowConstraints>
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+              </rowConstraints>
+              <children>
+                <Label text="Last message from:" GridPane.columnIndex="0" GridPane.rowIndex="0" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+                <Label text="Subject:" GridPane.columnIndex="0" GridPane.rowIndex="1" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+                <Label text="Filename:" GridPane.columnIndex="0" GridPane.rowIndex="2" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+                <Label text="Received at:" GridPane.columnIndex="0" GridPane.rowIndex="3" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+                <Label text="Add file:" GridPane.columnIndex="0" GridPane.rowIndex="4" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+                <Button text="Clear Data" onAction="#iridiumClearData" GridPane.columnIndex="0" GridPane.rowIndex="5" prefWidth="90.0" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+                <Label text="#Masseges on reconnect:" GridPane.columnIndex="0" GridPane.rowIndex="6" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+                <Button text="exportCSV" onAction="#iridiumExportCSV" GridPane.columnIndex="0" GridPane.rowIndex="7" prefWidth="90.0" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+                <Label fx:id="iridiumLastFrom" GridPane.columnIndex="1" GridPane.rowIndex="0" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+                <Label fx:id="iridiumLastSubject" GridPane.columnIndex="1" GridPane.rowIndex="1" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+                <Label fx:id="iridiumLastFilename" GridPane.columnIndex="1" GridPane.rowIndex="2" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+                <Label fx:id="iridiumLastTimestamp" GridPane.columnIndex="1" GridPane.rowIndex="3" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+                <Button text="Open" onAction="#iridiumOpen" GridPane.columnIndex="1" GridPane.rowIndex="4" prefWidth="60.0" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+                <TextField text="0" GridPane.columnIndex="1" GridPane.rowIndex="6" GridPane.halignment="RIGHT" maxWidth="60.0" prefWidth="60.0" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+                <Button text="Reconnect" onAction="#iridiumReconnect" GridPane.columnIndex="1" GridPane.rowIndex="7" prefWidth="90.0" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+              </children>
+            </GridPane>
+          </top>
+          <center>
+            <TextArea fx:id="iridiumTextArea" prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER" />
+          </center>
+        </BorderPane>
\ No newline at end of file
diff --git a/Universal-Space-Operations-Center/src/main/resources/testData/LogPanel.fxml b/Universal-Space-Operations-Center/src/main/resources/testData/LogPanel.fxml
index 66ca300..c56d9ae 100644
--- a/Universal-Space-Operations-Center/src/main/resources/testData/LogPanel.fxml
+++ b/Universal-Space-Operations-Center/src/main/resources/testData/LogPanel.fxml
@@ -12,20 +12,20 @@
 <BorderPane> 
 <padding><Insets top="5" right="5" bottom="5" left="5"/></padding> 
   <top> 
-    <GridPane> 
+    <GridPane alignment="TOP_CENTER" BorderPane.alignment="CENTER">
       <columnConstraints> 
-        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> 
-        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> 
+        <ColumnConstraints hgrow="SOMETIMES" /> 
+        <ColumnConstraints hgrow="SOMETIMES" /> 
       </columnConstraints> 
       <rowConstraints>
         <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
         <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
      </rowConstraints> 
       <children>
-        <Button text="Button 1" onAction="#button11" mnemonicParsing="false" GridPane.columnIndex="0" GridPane.rowIndex="0" />
-        <Label text="Label" GridPane.columnIndex="1" GridPane.rowIndex="0" />
-        <TextField promptText="Prompt Text" GridPane.columnIndex="0" GridPane.rowIndex="1" />
-        <Button text="Button 2" onAction="#button14" mnemonicParsing="false" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+        <Button text="Button 1" onAction="#button11" mnemonicParsing="false" GridPane.columnIndex="0" GridPane.rowIndex="0" maxWidth="-Infinity" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES"/>
+        <Label text="Label" GridPane.columnIndex="1" GridPane.rowIndex="0" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+        <TextField promptText="Prompt Text" GridPane.columnIndex="0" GridPane.rowIndex="1" GridPane.halignment="RIGHT" maxWidth="60.0" prefWidth="60.0" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
+        <Button text="Button 2" onAction="#button14" mnemonicParsing="false" GridPane.columnIndex="1" GridPane.rowIndex="1" maxWidth="-Infinity" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES"/>
       </children> 
     </GridPane> 
   </top>
diff --git a/Universal-Space-Operations-Center/src/test/java/com/ksatstuttgart/usoc/test/gui/GuiBuilderTest.java b/Universal-Space-Operations-Center/src/test/java/com/ksatstuttgart/usoc/test/gui/GuiBuilderTest.java
index 73e8467..54c8e5f 100644
--- a/Universal-Space-Operations-Center/src/test/java/com/ksatstuttgart/usoc/test/gui/GuiBuilderTest.java
+++ b/Universal-Space-Operations-Center/src/test/java/com/ksatstuttgart/usoc/test/gui/GuiBuilderTest.java
@@ -112,7 +112,7 @@ public void testLogPanelBuilder() throws Exception {
     @Test
     public void testCurrentStateBuilder() throws Exception {
         System.out.println("currentStateBuilder() has been tested");
-        GuiBuilder.StateBuilder("testData/CurrentStatePanel.fxml", "testData/test.properties");
+        GuiBuilder.StatePanelBuilder("testData/CurrentStatePanel.fxml", "testData/test.properties");
     }
     
 }