diff --git a/falsework-client/src/main/java/com/fx/client/gui/uicomponents/main/MainController.java b/falsework-client/src/main/java/com/fx/client/gui/uicomponents/main/MainController.java
index e3471e2..16a3448 100644
--- a/falsework-client/src/main/java/com/fx/client/gui/uicomponents/main/MainController.java
+++ b/falsework-client/src/main/java/com/fx/client/gui/uicomponents/main/MainController.java
@@ -68,7 +68,6 @@ public class MainController {
 
     @FXML
     private StackPane rootPane;
-    @FXML
     private JFXListView<Object> navigationList;
     @FXML
     private Pane backgroundPicturePane;
@@ -115,7 +114,6 @@ public class MainController {
     @FXML
     private JFXDrawersStack drawersStack;
 
-    @FXML
     private JFXDrawer leftDrawer;
 
     @FXML
@@ -130,10 +128,17 @@ public class MainController {
     @PostConstruct
     public void init() throws FlowException {
 
+        navigationList=new JFXListView<>();
+        navigationList.getStyleClass().add("navigation-list");
+        leftDrawer = new JFXDrawer();
+        leftDrawer.setId("navigation-menu");
+        leftDrawer.setSidePane(navigationList);
+        leftDrawer.setDefaultDrawerSize(240);
+        leftDrawer.setResizeContent(true);
+        leftDrawer.setOverLayVisible(false);
+        leftDrawer.setResizableOnDrag(true);
+
         ApplicationContext.getInstance().register(this, MainController.class);
-        rootPane.getChildren().removeAll(navigationList);
-        rootPane.getChildren().removeAll(leftDrawer);
-        rootPane.getChildren().removeAll(tabPane);
         userLabel.textProperty().bind(ApplicatonStore.nameProperty());
         roleLabel.textProperty().bind(ApplicatonStore.getRoles().asString());
         userButton.textProperty().bind(ApplicatonStore.nameProperty());
@@ -198,7 +203,6 @@ public class MainController {
             }
 
         });
-        drawersStack.setContent(tabPane);
         drawersStack.toggle(leftDrawer);
         drawersStack.setEffect(null);
 
diff --git a/falsework-client/src/main/resources/fxml/main/main.fxml b/falsework-client/src/main/resources/fxml/main/main.fxml
index 7b5bd64..af3b8f0 100644
--- a/falsework-client/src/main/resources/fxml/main/main.fxml
+++ b/falsework-client/src/main/resources/fxml/main/main.fxml
@@ -83,11 +83,11 @@
                     </children>
                 </HBox>
 
-                <JFXDrawersStack fx:id="drawersStack" VBox.vgrow="ALWAYS" />
-                <JFXDrawer id="navigation-menu" fx:id="leftDrawer" defaultDrawerSize="240.0" overLayVisible="false" />
-                <JFXTabPane fx:id="tabPane" />
-                <JFXListView fx:id="navigationList" maxWidth="-Infinity" minWidth="240.0" prefWidth="240.0" styleClass="navigation-list" />
-
+                <JFXDrawersStack fx:id="drawersStack" VBox.vgrow="ALWAYS" >
+                    <content>
+                        <JFXTabPane fx:id="tabPane" />
+                    </content>
+                </JFXDrawersStack>
             </children>
         </VBox>
     </children>