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
deleted file mode 100644
index 13ad32d..0000000
--- a/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogUpdate.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package polling_station_dashboard.statusLog.java;
-
-
-import javafx.event.EventHandler;
-
-/**
- * Created by Vladimir Eliezer Tokarev on 04/06/2016.
- * StatusLogUpdate gives the ability to update the status log object
- */
-public interface StatusLogUpdate extends EventHandler {
-    void UpdateStatusLog();
-}
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 665274f..d167cf7 100644
--- a/voting-station-gui/src/polling_station_dashboard/java/PollingStationDashboardController.java
+++ b/voting-station-gui/src/polling_station_dashboard/java/PollingStationDashboardController.java
@@ -14,8 +14,8 @@ public class PollingStationDashboardController {
     {
         this.eventHandlerMap = map;
     }
-    @FXML
 
+    @FXML
     private void OnStatusLogPressed(MouseEvent mousePressed)
     {
         this.eventHandlerMap.Handle(mousePressed);
diff --git a/voting-station-gui/src/polling_station_dashboard/settings/java/SettingsUpdate.java b/voting-station-gui/src/polling_station_dashboard/settings/java/SettingsUpdate.java
deleted file mode 100644
index 3e40979..0000000
--- a/voting-station-gui/src/polling_station_dashboard/settings/java/SettingsUpdate.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package polling_station_dashboard.settings.java;
-
-import javafx.event.EventHandler;
-
-/**
- * Created by Vladimir Eliezer Tokarev on 04/06/2016.
- * SettingsUpdate gives the ability to update the settings object
- * this interface extends InvocationHandler in order to be able to be called
- */
-public interface SettingsUpdate extends EventHandler {
-
-    void UpdateSettings();
-}
diff --git a/voting-station-gui/src/polling_station_dashboard/settings/java/SettingsVisualUpdater.java b/voting-station-gui/src/polling_station_dashboard/settings/java/SettingsVisualUpdater.java
index 4b32613..e00abe6 100644
--- a/voting-station-gui/src/polling_station_dashboard/settings/java/SettingsVisualUpdater.java
+++ b/voting-station-gui/src/polling_station_dashboard/settings/java/SettingsVisualUpdater.java
@@ -1,6 +1,7 @@
 package polling_station_dashboard.settings.java;
 
 import javafx.event.Event;
+import javafx.event.EventHandler;
 import javafx.scene.control.Button;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
@@ -11,7 +12,7 @@ import javafx.stage.Stage;
  * This object manages the visual changes of the settings panel
  * which means that he opens and closes settings panel)
  */
-public class SettingsVisualUpdater implements SettingsUpdate {
+public class SettingsVisualUpdater implements EventHandler {
 
     private GridPane settings;
     private static final int SETTINGS_HEIGHT_EXPANSION_VALUE = 60;
@@ -24,7 +25,6 @@ public class SettingsVisualUpdater implements SettingsUpdate {
         this.currentStage = primalStage;
     }
 
-    @Override
     public void UpdateSettings() {
         showSettingsButton(settingsOpened);
         if (!settingsOpened) {
diff --git a/voting-station-gui/src/polling_station_dashboard/settings/settings.fxml b/voting-station-gui/src/polling_station_dashboard/settings/settings.fxml
deleted file mode 100644
index a37f6a2..0000000
--- a/voting-station-gui/src/polling_station_dashboard/settings/settings.fxml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Created By Vladimir Eliezer Tokarev !-->
-
-<?import java.lang.*?>
-<?import javafx.scene.image.*?>
-<?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">
-   <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" />
-      <ColumnConstraints hgrow="SOMETIMES" maxWidth="216.0" minWidth="10.0" prefWidth="200.0" />
-      <ColumnConstraints hgrow="SOMETIMES" maxWidth="165.0" minWidth="10.0" prefWidth="136.0" />
-      <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-   </columnConstraints>
-   <rowConstraints>
-      <RowConstraints maxHeight="202.0" minHeight="0.0" prefHeight="54.0" vgrow="SOMETIMES" />
-      <RowConstraints maxHeight="561.0" minHeight="10.0" prefHeight="561.0" vgrow="SOMETIMES" />
-   </rowConstraints>
-   <children>
-      <GridPane GridPane.rowIndex="1">
-        <columnConstraints>
-          <ColumnConstraints hgrow="SOMETIMES" maxWidth="80.0" minWidth="10.0" prefWidth="53.0" />
-          <ColumnConstraints hgrow="SOMETIMES" maxWidth="125.0" minWidth="10.0" prefWidth="117.0" />
-        </columnConstraints>
-        <rowConstraints>
-          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-        </rowConstraints>
-         <children>
-            <BorderPane prefHeight="200.0" prefWidth="200.0">
-               <right>
-                  <ImageView BorderPane.alignment="CENTER">
-                     <image>
-                        <Image url="@../../pictures/bullets.png" />
-                     </image>
-                  </ImageView>
-               </right>
-            </BorderPane>
-            <BorderPane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1">
-               <left>
-                  <Label text="Manage voting booths" BorderPane.alignment="CENTER" />
-               </left>
-            </BorderPane>
-         </children>
-      </GridPane>
-      <GridPane GridPane.columnIndex="1" GridPane.rowIndex="1">
-        <columnConstraints>
-          <ColumnConstraints hgrow="SOMETIMES" maxWidth="80.0" minWidth="10.0" prefWidth="57.0" />
-          <ColumnConstraints hgrow="SOMETIMES" maxWidth="128.0" minWidth="10.0" prefWidth="113.0" />
-        </columnConstraints>
-        <rowConstraints>
-          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-        </rowConstraints>
-         <children>
-            <BorderPane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1">
-               <left>
-                  <Label text="Manage Polls workers" BorderPane.alignment="CENTER" />
-               </left>
-            </BorderPane>
-            <BorderPane prefHeight="200.0" prefWidth="200.0">
-               <right>
-                  <ImageView BorderPane.alignment="CENTER">
-                     <image>
-                        <Image url="@../../pictures/women.png" />
-                     </image>
-                  </ImageView>
-               </right>
-            </BorderPane>
-         </children>
-      </GridPane>
-      <GridPane GridPane.columnIndex="2" GridPane.rowIndex="1">
-        <columnConstraints>
-          <ColumnConstraints hgrow="SOMETIMES" maxWidth="79.0" minWidth="10.0" prefWidth="60.0" />
-          <ColumnConstraints hgrow="SOMETIMES" maxWidth="120.0" minWidth="10.0" prefWidth="110.0" />
-        </columnConstraints>
-        <rowConstraints>
-          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-        </rowConstraints>
-         <children>
-            <BorderPane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1">
-               <left>
-                  <Label text="Manage provisional votes" BorderPane.alignment="CENTER" />
-               </left>
-            </BorderPane>
-            <BorderPane prefHeight="200.0" prefWidth="200.0">
-               <right>
-                  <ImageView BorderPane.alignment="CENTER">
-                     <image>
-                        <Image url="@../../pictures/settings.png" />
-                     </image>
-                  </ImageView>
-               </right>
-            </BorderPane>
-         </children>
-      </GridPane>
-      <GridPane GridPane.columnIndex="3" GridPane.rowIndex="1">
-        <columnConstraints>
-          <ColumnConstraints hgrow="SOMETIMES" maxWidth="76.0" minWidth="10.0" prefWidth="54.0" />
-          <ColumnConstraints hgrow="SOMETIMES" maxWidth="108.0" minWidth="10.0" prefWidth="108.0" />
-        </columnConstraints>
-        <rowConstraints>
-          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-        </rowConstraints>
-         <children>
-            <BorderPane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1">
-               <left>
-                  <Label text="Close polling station" BorderPane.alignment="CENTER" />
-               </left>
-            </BorderPane>
-            <BorderPane prefHeight="200.0" prefWidth="200.0">
-               <right>
-                  <ImageView BorderPane.alignment="CENTER">
-                     <image>
-                        <Image url="@../../pictures/exit.png" />
-                     </image>
-                  </ImageView>
-               </right>
-            </BorderPane>
-         </children>
-      </GridPane>
-   </children>
-</GridPane>
diff --git a/voting-station-gui/src/polling_station_dashboard/statusLog/java/StatusLogVisualUpdater.java b/voting-station-gui/src/polling_station_dashboard/statusLog/java/StatusLogVisualUpdater.java
index 234a3bb..60f3321 100644
--- a/voting-station-gui/src/polling_station_dashboard/statusLog/java/StatusLogVisualUpdater.java
+++ b/voting-station-gui/src/polling_station_dashboard/statusLog/java/StatusLogVisualUpdater.java
@@ -1,6 +1,7 @@
 package polling_station_dashboard.statusLog.java;
 
 import javafx.event.Event;
+import javafx.event.EventHandler;
 import javafx.scene.control.Button;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
@@ -11,7 +12,7 @@ import javafx.stage.Stage;
  * This object manages the visual changes of the status log panel
  * which means that he opens and closes status log panel)
  */
-public class StatusLogVisualUpdater implements StatusLogUpdate {
+public class StatusLogVisualUpdater implements EventHandler {
 
     private static final int STATUS_LOG_WIDTH_EXPANSION_VALUE = 400;
     private boolean statusLogOpened = false;
@@ -25,7 +26,6 @@ public class StatusLogVisualUpdater implements StatusLogUpdate {
         this.currentStage = primalStage;
     }
 
-    @Override
     public void UpdateStatusLog(){
         showStatusLogButton(statusLogOpened);
         if (!statusLogOpened) {