diff --git a/voting-station-gui/src/pictures/[Originals]/profile.png b/voting-station-gui/src/pictures/[Originals]/profile.png
new file mode 100644
index 0000000..7971691
Binary files /dev/null and b/voting-station-gui/src/pictures/[Originals]/profile.png differ
diff --git a/voting-station-gui/src/pictures/profile.png b/voting-station-gui/src/pictures/profile.png
new file mode 100644
index 0000000..7ac6047
Binary files /dev/null and b/voting-station-gui/src/pictures/profile.png differ
diff --git a/voting-station-gui/src/polling_station_dashboard/StatusLog/fxml/status_log.fxml b/voting-station-gui/src/polling_station_dashboard/StatusLog/fxml/status_log.fxml
index 6cdbb56..eb1a5b0 100644
--- a/voting-station-gui/src/polling_station_dashboard/StatusLog/fxml/status_log.fxml
+++ b/voting-station-gui/src/polling_station_dashboard/StatusLog/fxml/status_log.fxml
@@ -7,7 +7,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<GridPane fx:id="StatusLogGridPane" prefHeight="615.0" prefWidth="400.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="polling_station_dashboard.StatusLog.java.StatusLogController">
+<GridPane fx:id="StatusLogGridPane" prefHeight="615.0" prefWidth="400.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="polling_station_dashboard.statusLog.java.StatusLogController">
    <children>
       <BorderPane onMousePressed="#CloseStatusLog" prefHeight="200.0" prefWidth="200.0">
          <center>
diff --git a/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogController.java b/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogController.java
index 625e432..aeda2d5 100644
--- a/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogController.java
+++ b/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogController.java
@@ -1,4 +1,4 @@
-package polling_station_dashboard.StatusLog.java;
+package polling_station_dashboard.statusLog.java;
 
 import javafx.fxml.FXML;
 import javafx.stage.Stage;
diff --git a/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogLoader.java b/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogLoader.java
index 5753f6e..1824bfe 100644
--- a/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogLoader.java
+++ b/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogLoader.java
@@ -1,4 +1,4 @@
-package polling_station_dashboard.StatusLog.java;
+package polling_station_dashboard.statusLog.java;
 
 import javafx.fxml.FXMLLoader;
 import javafx.scene.layout.GridPane;
diff --git a/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogUpdate.java b/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogUpdate.java
index e032d72..ed977d0 100644
--- a/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogUpdate.java
+++ b/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogUpdate.java
@@ -1,4 +1,4 @@
-package polling_station_dashboard.StatusLog.java;
+package polling_station_dashboard.statusLog.java;
 
 /**
  * Created by Vladimir Eliezer Tokarev on 04/06/2016.
diff --git a/voting-station-gui/src/polling_station_dashboard/java/PollingStationDashboardController.java b/voting-station-gui/src/polling_station_dashboard/java/PollingStationDashboardController.java
index 0884fe6..b2cf658 100644
--- a/voting-station-gui/src/polling_station_dashboard/java/PollingStationDashboardController.java
+++ b/voting-station-gui/src/polling_station_dashboard/java/PollingStationDashboardController.java
@@ -5,7 +5,7 @@ import javafx.scene.control.Button;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
 import javafx.stage.Stage;
-import polling_station_dashboard.StatusLog.java.StatusLogUpdate;
+import polling_station_dashboard.statusLog.java.StatusLogUpdate;
 import polling_station_dashboard.settings.java.SettingsUpdate;
 
 /**
@@ -58,18 +58,18 @@ public class PollingStationDashboardController implements StatusLogUpdate, Setti
     }
 
     private void addStatusLog() {
-        Pane statusLog = (Pane) currentStage.getScene().lookup("#StatusLog");
+        Pane statusLog = (Pane) currentStage.getScene().lookup("#statusLog");
         statusLog.getChildren().add(this.statusLog);
     }
 
     private void removeStatusLog(){
-        Pane statusLog = (Pane) currentStage.getScene().lookup("#StatusLog");
+        Pane statusLog = (Pane) currentStage.getScene().lookup("#statusLog");
         statusLog.getChildren().remove(this.statusLog);
     }
 
     private void SetStatusLogSize(int expansionWidth) {
         currentStage.setWidth(currentStage.getWidth() + expansionWidth);
-        Pane statusLog = (Pane) currentStage.getScene().lookup("#StatusLog");
+        Pane statusLog = (Pane) currentStage.getScene().lookup("#statusLog");
         statusLog.setPrefWidth(expansionWidth);
     }
 
diff --git a/voting-station-gui/src/polling_station_dashboard/java/PollingStationDashboardLoader.java b/voting-station-gui/src/polling_station_dashboard/java/PollingStationDashboardLoader.java
index baf782e..ddcb355 100644
--- a/voting-station-gui/src/polling_station_dashboard/java/PollingStationDashboardLoader.java
+++ b/voting-station-gui/src/polling_station_dashboard/java/PollingStationDashboardLoader.java
@@ -4,7 +4,7 @@ import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
-import polling_station_dashboard.StatusLog.java.StatusLogLoader;
+import polling_station_dashboard.statusLog.java.StatusLogLoader;
 import polling_station_dashboard.settings.java.settingsLoader;
 
 import java.io.IOException;
diff --git a/voting-station-gui/src/polling_station_dashboard/settings/java/settingsLoader.java b/voting-station-gui/src/polling_station_dashboard/settings/java/settingsLoader.java
index f5bf59d..d89057f 100644
--- a/voting-station-gui/src/polling_station_dashboard/settings/java/settingsLoader.java
+++ b/voting-station-gui/src/polling_station_dashboard/settings/java/settingsLoader.java
@@ -3,8 +3,6 @@ package polling_station_dashboard.settings.java;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.layout.GridPane;
 import javafx.stage.Stage;
-import polling_station_dashboard.StatusLog.java.StatusLogController;
-import polling_station_dashboard.StatusLog.java.StatusLogUpdate;
 
 import java.io.IOException;
 
diff --git a/voting-station-gui/src/polling_station_dashboard/settings/settings.fxml b/voting-station-gui/src/polling_station_dashboard/settings/settings.fxml
index aa6b371..a37f6a2 100644
--- a/voting-station-gui/src/polling_station_dashboard/settings/settings.fxml
+++ b/voting-station-gui/src/polling_station_dashboard/settings/settings.fxml
@@ -7,7 +7,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<GridPane fx:id="StatusLogGridPane" prefHeight="70.0" prefWidth="850.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="polling_station_dashboard.StatusLog.java.StatusLogController">
+<GridPane fx:id="StatusLogGridPane" prefHeight="70.0" prefWidth="850.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="polling_station_dashboard.statusLog.java.StatusLogController">
    <columnConstraints>
       <ColumnConstraints hgrow="SOMETIMES" maxWidth="177.0" minWidth="10.0" prefWidth="177.0" />
       <ColumnConstraints hgrow="SOMETIMES" maxWidth="172.0" minWidth="10.0" prefWidth="144.0" />
diff --git a/voting-station-gui/src/polling_station_dashboard/voterEdit/fxml/voter_edit.fxml b/voting-station-gui/src/polling_station_dashboard/voterEdit/fxml/voter_edit.fxml
new file mode 100644
index 0000000..dc42ded
--- /dev/null
+++ b/voting-station-gui/src/polling_station_dashboard/voterEdit/fxml/voter_edit.fxml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.image.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.text.*?>
+<?import javafx.scene.control.*?>
+<?import java.lang.*?>
+<?import javafx.scene.layout.*?>
+
+<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="152.0" prefWidth="783.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8">
+  <columnConstraints>
+      <ColumnConstraints />
+    <ColumnConstraints />
+    <ColumnConstraints hgrow="SOMETIMES" maxWidth="251.0" minWidth="10.0" prefWidth="118.0" />
+      <ColumnConstraints hgrow="SOMETIMES" maxWidth="467.0" minWidth="10.0" prefWidth="194.0" />
+      <ColumnConstraints hgrow="SOMETIMES" maxWidth="470.0" minWidth="10.0" prefWidth="458.0" />
+  </columnConstraints>
+  <rowConstraints>
+    <RowConstraints />
+      <RowConstraints />
+      <RowConstraints />
+      <RowConstraints />
+      <RowConstraints />
+      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+  </rowConstraints>
+   <children>
+      <GridPane GridPane.columnIndex="3" GridPane.rowIndex="5">
+        <columnConstraints>
+          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+        </columnConstraints>
+        <rowConstraints>
+          <RowConstraints maxHeight="58.0" minHeight="10.0" prefHeight="41.0" vgrow="SOMETIMES" />
+          <RowConstraints maxHeight="85.0" minHeight="10.0" prefHeight="84.0" vgrow="SOMETIMES" />
+        </rowConstraints>
+         <children>
+            <GridPane>
+              <columnConstraints>
+                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+              </columnConstraints>
+              <rowConstraints>
+                <RowConstraints maxHeight="16.0" minHeight="9.0" prefHeight="12.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="28.0" minHeight="10.0" prefHeight="25.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="9.0" minHeight="4.0" prefHeight="4.0" vgrow="SOMETIMES" />
+              </rowConstraints>
+               <children>
+                  <TextArea prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1" />
+               </children>
+            </GridPane>
+            <GridPane GridPane.rowIndex="1">
+              <columnConstraints>
+                <ColumnConstraints hgrow="SOMETIMES" maxWidth="92.0" minWidth="10.0" prefWidth="84.0" />
+                <ColumnConstraints hgrow="SOMETIMES" maxWidth="110.0" minWidth="10.0" prefWidth="110.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>
+               <children>
+                  <BorderPane prefHeight="200.0" prefWidth="200.0">
+                     <bottom>
+                        <Label prefHeight="17.0" prefWidth="77.0" text="ID number" BorderPane.alignment="CENTER" />
+                     </bottom>
+                  </BorderPane>
+                  <BorderPane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1">
+                     <center>
+                        <Label text="Eligible to vote" BorderPane.alignment="CENTER" />
+                     </center>
+                  </BorderPane>
+                  <BorderPane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="2">
+                     <center>
+                        <Label text="Status" BorderPane.alignment="CENTER">
+                           <padding>
+                              <Insets right="45.0" />
+                           </padding>
+                        </Label>
+                     </center>
+                  </BorderPane>
+                  <BorderPane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="3">
+                     <center>
+                        <Label text="Channel" BorderPane.alignment="CENTER">
+                           <padding>
+                              <Insets right="35.0" />
+                           </padding>
+                        </Label>
+                     </center>
+                  </BorderPane>
+                  <ComboBox prefWidth="150.0" promptText="No" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                  <ComboBox prefWidth="150.0" promptText="Provisional" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                  <ComboBox prefWidth="150.0" promptText="IDC Maths" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+                  <TextArea prefHeight="200.0" prefWidth="200.0" text="42342342" GridPane.columnIndex="1" />
+               </children>
+            </GridPane>
+         </children>
+      </GridPane>
+      <BorderPane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="2" GridPane.rowIndex="5">
+         <center>
+            <ImageView BorderPane.alignment="CENTER">
+               <image>
+                  <Image url="@../../../pictures/profile.png" />
+               </image>
+            </ImageView>
+         </center>
+      </BorderPane>
+      <GridPane GridPane.columnIndex="4" GridPane.rowIndex="5">
+        <columnConstraints>
+          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+        </columnConstraints>
+        <rowConstraints>
+          <RowConstraints maxHeight="70.0" minHeight="10.0" prefHeight="51.0" vgrow="SOMETIMES" />
+          <RowConstraints maxHeight="103.0" minHeight="10.0" prefHeight="101.0" vgrow="SOMETIMES" />
+        </rowConstraints>
+         <children>
+            <GridPane GridPane.rowIndex="1">
+              <columnConstraints>
+                  <ColumnConstraints hgrow="SOMETIMES" maxWidth="149.0" minWidth="10.0" prefWidth="26.0" />
+                <ColumnConstraints hgrow="SOMETIMES" maxWidth="408.0" minWidth="10.0" prefWidth="403.0" />
+                <ColumnConstraints hgrow="SOMETIMES" maxWidth="119.0" minWidth="10.0" prefWidth="27.0" />
+              </columnConstraints>
+              <rowConstraints>
+                <RowConstraints maxHeight="30.0" minHeight="1.0" prefHeight="8.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="93.0" minHeight="10.0" prefHeight="85.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="26.0" minHeight="0.0" prefHeight="8.0" vgrow="SOMETIMES" />
+              </rowConstraints>
+               <children>
+                  <TextArea prefHeight="89.0" prefWidth="406.0" text="Update reason (optional)" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+               </children>
+            </GridPane>
+            <GridPane>
+              <columnConstraints>
+                <ColumnConstraints hgrow="SOMETIMES" maxWidth="342.0" minWidth="10.0" prefWidth="304.0" />
+                <ColumnConstraints hgrow="SOMETIMES" maxWidth="226.0" minWidth="10.0" prefWidth="158.0" />
+              </columnConstraints>
+              <rowConstraints>
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+              </rowConstraints>
+               <children>
+                  <GridPane GridPane.columnIndex="1">
+                    <columnConstraints>
+                      <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                      <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                    </columnConstraints>
+                    <rowConstraints>
+                      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                    </rowConstraints>
+                     <children>
+                        <BorderPane prefHeight="200.0" prefWidth="200.0">
+                           <center>
+                              <Button mnemonicParsing="false" text="Cancel" BorderPane.alignment="CENTER" />
+                           </center>
+                        </BorderPane>
+                        <BorderPane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1">
+                           <center>
+                              <Button mnemonicParsing="false" text="Save" BorderPane.alignment="CENTER" />
+                           </center>
+                        </BorderPane>
+                     </children>
+                  </GridPane>
+               </children>
+            </GridPane>
+         </children>
+      </GridPane>
+   </children>
+</GridPane>
diff --git a/voting-station-gui/src/polling_station_dashboard/voterEdit/java/VoterEditController.java b/voting-station-gui/src/polling_station_dashboard/voterEdit/java/VoterEditController.java
new file mode 100644
index 0000000..0d60d95
--- /dev/null
+++ b/voting-station-gui/src/polling_station_dashboard/voterEdit/java/VoterEditController.java
@@ -0,0 +1,7 @@
+package polling_station_dashboard.voterEdit.java;
+
+/**
+ * Created by Vladimir Eliezer Tokarev on 11/06/2016.
+ */
+public class VoterEditController {
+}
diff --git a/voting-station-gui/src/polling_station_dashboard/voterEdit/java/VoterEditLoader.java b/voting-station-gui/src/polling_station_dashboard/voterEdit/java/VoterEditLoader.java
new file mode 100644
index 0000000..7a82968
--- /dev/null
+++ b/voting-station-gui/src/polling_station_dashboard/voterEdit/java/VoterEditLoader.java
@@ -0,0 +1,7 @@
+package polling_station_dashboard.voterEdit.java;
+
+/**
+ * Created by Vladimir Eliezer Tokarev on 11/06/2016.
+ */
+public class VoterEditLoader {
+}