diff --git a/voting-station-gui/src/fxmls/polling_station_dashboard.fxml b/voting-station-gui/src/fxmls/polling_station_dashboard.fxml
new file mode 100644
index 0000000..3090d81
--- /dev/null
+++ b/voting-station-gui/src/fxmls/polling_station_dashboard.fxml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.image.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<GridPane alignment="center" hgap="10" vgap="10" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="splash_screen_on_boot.Controller">
+   <columnConstraints>
+      <ColumnConstraints />
+      <ColumnConstraints />
+      <ColumnConstraints />
+   </columnConstraints>
+   <rowConstraints>
+      <RowConstraints />
+      <RowConstraints />
+      <RowConstraints />
+   </rowConstraints>
+   <children>
+      <AnchorPane prefHeight="585.0" prefWidth="829.0" GridPane.columnIndex="1" GridPane.rowIndex="1">
+         <children>
+            <Pane layoutX="24.0" layoutY="14.0" prefHeight="102.0" prefWidth="714.0">
+               <children>
+                  <BorderPane prefHeight="102.0" prefWidth="714.0">
+                     <right>
+                        <Button mnemonicParsing="false" prefHeight="50.0" prefWidth="112.0" text="Search" BorderPane.alignment="CENTER" />
+                     </right>
+                     <bottom>
+                        <Separator prefWidth="200.0" BorderPane.alignment="CENTER" />
+                     </bottom>
+                     <left>
+                        <ImageView fitHeight="65.0" fitWidth="66.0" BorderPane.alignment="CENTER">
+                           <image>
+                              <Image url="@../pictures/barcode.png" />
+                           </image>
+                        </ImageView>
+                     </left>
+                     <center>
+                        <TextField prefHeight="56.0" prefWidth="536.0" BorderPane.alignment="CENTER" />
+                     </center>
+                  </BorderPane>
+               </children>
+            </Pane>
+            <Pane layoutX="8.0" prefHeight="26.0" prefWidth="755.0">
+               <children>
+                  <BorderPane layoutX="12.0" prefHeight="26.0" prefWidth="743.0">
+                     <bottom>
+                        <Separator prefWidth="200.0" BorderPane.alignment="CENTER" />
+                     </bottom>
+                  </BorderPane>
+               </children>
+            </Pane>
+            <BorderPane layoutX="12.0" layoutY="531.0" prefHeight="26.0" prefWidth="755.0">
+               <bottom>
+                  <Separator prefWidth="200.0" BorderPane.alignment="CENTER" />
+               </bottom>
+            </BorderPane>
+            <BorderPane layoutX="-8.0" layoutY="32.0" prefHeight="517.0" prefWidth="22.0">
+               <right>
+                  <Separator orientation="VERTICAL" prefHeight="200.0" BorderPane.alignment="CENTER" />
+               </right>
+            </BorderPane>
+            <BorderPane layoutX="756.0" layoutY="31.0" prefHeight="517.0" prefWidth="22.0">
+               <right>
+                  <Separator orientation="VERTICAL" prefHeight="200.0" BorderPane.alignment="CENTER" />
+               </right>
+            </BorderPane>
+            <Pane layoutX="788.0" layoutY="12.0" prefHeight="544.0" prefWidth="42.0">
+               <children>
+                  <Button layoutX="-251.0" layoutY="250.0" mnemonicParsing="false" prefHeight="43.0" prefWidth="545.0" rotate="-90.0" text="Status Log" />
+               </children>
+            </Pane>
+            <Pane layoutY="557.0" prefHeight="34.0" prefWidth="830.0">
+               <children>
+                  <Button mnemonicParsing="false" prefHeight="34.0" prefWidth="790.0" text="Settings" />
+               </children>
+            </Pane>
+         </children>
+      </AnchorPane>
+   </children>
+</GridPane>
diff --git a/voting-station-gui/src/fxmls/set_up_complete.fxml b/voting-station-gui/src/fxmls/set_up_complete.fxml
index 44217a6..dc7321f 100644
--- a/voting-station-gui/src/fxmls/set_up_complete.fxml
+++ b/voting-station-gui/src/fxmls/set_up_complete.fxml
@@ -24,14 +24,16 @@
    <children>
       <AnchorPane prefHeight="348.0" prefWidth="547.0" GridPane.columnIndex="1" GridPane.rowIndex="1">
          <children>
-            <GridPane layoutX="-4.0" layoutY="-14.0" prefHeight="358.0" prefWidth="558.0">
+            <GridPane prefHeight="358.0" prefWidth="547.0">
               <columnConstraints>
                 <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
               </columnConstraints>
               <rowConstraints>
-                <RowConstraints maxHeight="177.0" minHeight="10.0" prefHeight="78.0" vgrow="SOMETIMES" />
-                <RowConstraints maxHeight="213.0" minHeight="10.0" prefHeight="75.0" vgrow="SOMETIMES" />
-                <RowConstraints maxHeight="175.0" minHeight="10.0" prefHeight="175.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="143.0" minHeight="10.0" prefHeight="143.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="66.0" minHeight="0.0" prefHeight="0.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
               </rowConstraints>
                <children>
                   <GridPane>
@@ -40,106 +42,72 @@
                     </columnConstraints>
                     <rowConstraints>
                       <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                        <RowConstraints maxHeight="36.0" minHeight="10.0" prefHeight="25.0" vgrow="SOMETIMES" />
-                      <RowConstraints maxHeight="60.0" minHeight="10.0" prefHeight="40.0" vgrow="SOMETIMES" />
+                      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                     </rowConstraints>
                      <children>
                         <BorderPane prefHeight="200.0" prefWidth="200.0">
-                           <bottom>
-                              <Label prefHeight="17.0" prefWidth="214.0" text="   Election Parameters being loaded...." BorderPane.alignment="CENTER" />
-                           </bottom>
+                           <center>
+                              <Label text="This is the name of the Election" BorderPane.alignment="CENTER" />
+                           </center>
                         </BorderPane>
-                        <GridPane prefHeight="42.0" prefWidth="566.0" GridPane.rowIndex="1">
+                        <GridPane GridPane.rowIndex="1">
                           <columnConstraints>
-                              <ColumnConstraints hgrow="SOMETIMES" maxWidth="116.0" minWidth="10.0" prefWidth="68.0" />
-                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="455.0" minWidth="10.0" prefWidth="422.0" />
-                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="181.0" minWidth="10.0" prefWidth="65.0" />
+                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="134.0" minWidth="10.0" prefWidth="88.0" />
+                              <ColumnConstraints hgrow="SOMETIMES" maxWidth="445.0" minWidth="10.0" prefWidth="372.0" />
+                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="179.0" minWidth="10.0" prefWidth="85.0" />
                           </columnConstraints>
                           <rowConstraints>
                             <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                          </rowConstraints>
-                           <children>
-                              <BorderPane prefHeight="41.0" prefWidth="428.0" GridPane.columnIndex="1">
-                                 <center>
-                                    <Separator prefHeight="2.0" prefWidth="446.0" BorderPane.alignment="CENTER" />
-                                 </center>
-                              </BorderPane>
-                           </children>
-                        </GridPane>
-                        <GridPane prefHeight="7.0" prefWidth="558.0" GridPane.rowIndex="2">
-                          <columnConstraints>
-                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="291.0" minWidth="10.0" prefWidth="269.0" />
-                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="180.0" minWidth="10.0" prefWidth="103.0" />
-                          </columnConstraints>
-                          <rowConstraints>
-                            <RowConstraints minHeight="10.0" prefHeight="20.0" vgrow="SOMETIMES" />
                           </rowConstraints>
                            <children>
                               <BorderPane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1">
-                                 <top>
-                                    <Label text="Station Fingerprit:" BorderPane.alignment="CENTER" />
-                                 </top>
+                                 <center>
+                                    <Separator prefWidth="200.0" BorderPane.alignment="CENTER" />
+                                 </center>
                               </BorderPane>
                            </children>
                         </GridPane>
                      </children>
                   </GridPane>
-                  <BorderPane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1">
-                     <center>
-                        <GridPane BorderPane.alignment="CENTER">
-                          <columnConstraints>
-                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="280.0" minWidth="10.0" prefWidth="32.0" />
-                              <ColumnConstraints hgrow="SOMETIMES" maxWidth="497.0" minWidth="10.0" prefWidth="497.0" />
-                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="429.0" minWidth="10.0" prefWidth="32.0" />
-                          </columnConstraints>
-                          <rowConstraints>
-                            <RowConstraints maxHeight="25.0" minHeight="8.0" prefHeight="8.0" vgrow="SOMETIMES" />
-                            <RowConstraints maxHeight="72.0" minHeight="10.0" prefHeight="72.0" vgrow="SOMETIMES" />
-                            <RowConstraints maxHeight="24.0" minHeight="9.0" prefHeight="10.0" vgrow="SOMETIMES" />
-                          </rowConstraints>
-                           <children>
-                              <BorderPane prefHeight="200.0" prefWidth="200.0" style="-fx-background-color: #a9a9a9;" GridPane.columnIndex="1" GridPane.rowIndex="1">
-                                 <center>
-                                    <Label prefHeight="36.0" prefWidth="486.0" style="-fx-background-color: #a9a9a9;" text="43:51:43:a1:b5:fc:8b:b7:0a:3a:a9:b1:0f:66:73:a8" BorderPane.alignment="CENTER">
-                                       <font>
-                                          <Font size="24.0" />
-                                       </font></Label>
-                                 </center>
-                              </BorderPane>
-                           </children>
-                        </GridPane>
-                     </center>
-                  </BorderPane>
-                  <GridPane GridPane.rowIndex="2">
+                  <GridPane GridPane.rowIndex="1">
                     <columnConstraints>
-                      <ColumnConstraints hgrow="SOMETIMES" maxWidth="183.0" minWidth="10.0" prefWidth="161.0" />
-                        <ColumnConstraints hgrow="SOMETIMES" maxWidth="340.0" minWidth="10.0" prefWidth="246.0" />
-                      <ColumnConstraints hgrow="SOMETIMES" maxWidth="179.0" minWidth="10.0" prefWidth="151.0" />
+                      <ColumnConstraints hgrow="SOMETIMES" maxWidth="177.0" minWidth="10.0" prefWidth="98.0" />
+                        <ColumnConstraints hgrow="SOMETIMES" maxWidth="267.0" minWidth="10.0" prefWidth="267.0" />
+                      <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
                     </columnConstraints>
                     <rowConstraints>
-                      <RowConstraints maxHeight="54.0" minHeight="10.0" prefHeight="28.0" vgrow="SOMETIMES" />
-                      <RowConstraints maxHeight="89.0" minHeight="10.0" prefHeight="89.0" vgrow="SOMETIMES" />
                       <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                     </rowConstraints>
                      <children>
                         <BorderPane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1">
                            <top>
-                              <Label text="Waiting for Verification" BorderPane.alignment="CENTER" />
+                              <Label prefHeight="30.0" prefWidth="267.0" text="Polling Station Setup Is Complete " BorderPane.alignment="CENTER">
+                                 <font>
+                                    <Font size="17.5" />
+                                 </font>
+                              </Label>
                            </top>
                         </BorderPane>
-                        <BorderPane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="1">
-                           <top>
-                               <ImageView fx:id="LoadingGif" BorderPane.alignment="CENTER">
-                                   <image>
-                                       <Image url="@../gifs/VerticalLoading.gif" />
-                                   </image>
-                               </ImageView>
-                           </top>
-                        </BorderPane>
-                        <BorderPane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="2" GridPane.rowIndex="2">
+                     </children>
+                  </GridPane>
+                  <GridPane GridPane.rowIndex="2">
+                    <columnConstraints>
+                      <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.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>
+                     <children>
+                        <BorderPane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1">
                            <center>
-                              <Button mnemonicParsing="false" text="Override" BorderPane.alignment="CENTER" />
+                              <Label text="Go to polling station dashboard" BorderPane.alignment="CENTER" />
+                           </center>
+                        </BorderPane>
+                        <BorderPane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="2">
+                           <center>
+                              <Button mnemonicParsing="false" text="Ok" BorderPane.alignment="CENTER" />
                            </center>
                         </BorderPane>
                      </children>
@@ -148,6 +116,5 @@
             </GridPane>
          </children>
       </AnchorPane>
-      <Separator prefWidth="200.0" GridPane.columnIndex="1" />
    </children>
 </GridPane>
diff --git a/voting-station-gui/src/pictures/barcode.png b/voting-station-gui/src/pictures/barcode.png
new file mode 100644
index 0000000..10af4e2
Binary files /dev/null and b/voting-station-gui/src/pictures/barcode.png differ