diff --git a/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java b/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java
index ce82cf4..efc61c7 100644
--- a/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java
+++ b/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java
@@ -89,112 +89,68 @@ import kellerkinder.HomeFlix.datatypes.FilmTabelDataType;
 
 public class MainWindowController {	
 	
-	@FXML
-	private AnchorPane mainAnchorPane;
-	@FXML
-	private AnchorPane tableModeAnchorPane;
+	// general/settings fxml elements
+	@FXML private AnchorPane mainAnchorPane;
+	@FXML private ScrollPane settingsScrollPane;
 	
-	@FXML
-	private ScrollPane settingsScrollPane;
-	@FXML
-	private ScrollPane textScrollPane;
+	@FXML private JFXHamburger menuHam;
+	@FXML private HBox topHBox;
+	@FXML private VBox sideMenuVBox;
+	@FXML private TableView<SourceDataType> sourcesTable;
 	
-	@FXML
-	private HBox topHBox;
+	@FXML private JFXButton aboutBtn;
+	@FXML private JFXButton settingsBtn;
+	@FXML private JFXButton updateBtn;
+	@FXML private JFXButton addDirectoryBtn;
+	@FXML private JFXButton addStreamSourceBtn;
 	
-	@FXML
-	private VBox sideMenuVBox;
+	@FXML private JFXToggleButton autoUpdateToggleBtn;
+	@FXML private JFXToggleButton autoplayToggleBtn;
 	
-	@FXML
-	private TreeTableView<FilmTabelDataType> filmsTreeTable;
+	@FXML private JFXColorPicker colorPicker;
 	
-	@FXML
-	private TableView<SourceDataType> sourcesTable;
+	@FXML private ChoiceBox<String> languageChoisBox = new ChoiceBox<>();
+	@FXML private ChoiceBox<String> branchChoisBox = new ChoiceBox<>();
 
-	@FXML
-	private TextFlow textFlow;
+	@FXML private JFXSlider fontsizeSlider;
 
-	@FXML
-	private JFXButton playbtn;
-	@FXML
-	private JFXButton openfolderbtn;
-	@FXML
-	private JFXButton returnBtn;
-	@FXML
-	private JFXButton forwardBtn;
-	@FXML
-	private JFXButton aboutBtn;
-	@FXML
-	private JFXButton settingsBtn;
-	@FXML
-	private JFXButton updateBtn;
-	@FXML
-	private JFXButton addDirectoryBtn;
-	@FXML
-	private JFXButton addStreamSourceBtn;
+	@FXML private Label homeflixSettingsLbl;
+	@FXML private Label mainColorLbl;
+	@FXML private Label fontsizeLbl;
+	@FXML private Label languageLbl;
+	@FXML private Label updateLbl;
+	@FXML private Label branchLbl;
+	@FXML private Label sourcesLbl;
+	@FXML private Label versionLbl;
 	
-	@FXML
-	private JFXHamburger menuHam;
+	@FXML private TreeItem<SourceDataType> sourceRoot = new TreeItem<>(new SourceDataType("", ""));
+	@FXML private TableColumn<SourceDataType, String> sourceColumn;
+	@FXML private TableColumn<SourceDataType, String> modeColumn;
+	
+	// table-mode
+	@FXML private AnchorPane tableModeAnchorPane;
+	@FXML private JFXTextField searchTextField;
+	
+	@FXML private TreeTableView<FilmTabelDataType> filmsTreeTable;
+	@FXML private TreeItem<FilmTabelDataType> filmRoot = new TreeItem<>(new FilmTabelDataType("", "", "", "", false, false, null));
+	@FXML private TreeTableColumn<FilmTabelDataType, String> columnStreamUrl = new TreeTableColumn<>("File Name");
+	@FXML private TreeTableColumn<FilmTabelDataType, String> columnTitle = new TreeTableColumn<>("Title");
+	@FXML private TreeTableColumn<FilmTabelDataType, String> columnSeason = new TreeTableColumn<>("Season");
+	@FXML private TreeTableColumn<FilmTabelDataType, String> columnEpisode = new TreeTableColumn<>("Episode");
+	@FXML private TreeTableColumn<FilmTabelDataType, ImageView> columnFavorite = new TreeTableColumn<>("Favorite");
+	
+	@FXML private ScrollPane textScrollPane;
+	@FXML private TextFlow textFlow;
+	@FXML private ImageView posterImageView;
+	
+	@FXML private JFXButton playbtn;
+	@FXML private JFXButton openfolderbtn;
+	@FXML private JFXButton returnBtn;
+	@FXML private JFXButton forwardBtn;
 
-	@FXML
-	private JFXToggleButton autoUpdateToggleBtn;
-	@FXML
-	private JFXToggleButton autoplayToggleBtn;
+	// poster-mode
+//	@FXML private AnchorPane posterModeAnchorPane;
 
-	@FXML
-	private JFXTextField searchTextField;
-
-	@FXML
-	private JFXColorPicker colorPicker;
-
-	@FXML
-	private ChoiceBox<String> languageChoisBox = new ChoiceBox<>();
-	@FXML
-	private ChoiceBox<String> branchChoisBox = new ChoiceBox<>();
-
-	@FXML
-	private JFXSlider fontsizeSlider;
-
-	@FXML
-	private Label homeflixSettingsLbl;
-	@FXML
-	private Label mainColorLbl;
-	@FXML
-	private Label fontsizeLbl;
-	@FXML
-	private Label languageLbl;
-	@FXML
-	private Label updateLbl;
-	@FXML
-	private Label branchLbl;
-	@FXML
-	private Label sourcesLbl;
-	@FXML
-	private Label versionLbl;
-
-	@FXML
-	private ImageView posterImageView;
-	private ImageView imv1;
-    
-	@FXML
-	private TreeItem<FilmTabelDataType> filmRoot = new TreeItem<>(new FilmTabelDataType("", "", "", "", false, false, imv1));
-	@FXML
-	private TreeTableColumn<FilmTabelDataType, String> columnStreamUrl = new TreeTableColumn<>("File Name");
-	@FXML
-	private TreeTableColumn<FilmTabelDataType, String> columnTitle = new TreeTableColumn<>("Title");
-	@FXML
-	private TreeTableColumn<FilmTabelDataType, String> columnSeason = new TreeTableColumn<>("Season");
-	@FXML
-	private TreeTableColumn<FilmTabelDataType, String> columnEpisode = new TreeTableColumn<>("Episode");
-	@FXML
-	private TreeTableColumn<FilmTabelDataType, ImageView> columnFavorite = new TreeTableColumn<>("Favorite");
-
-	@FXML
-	private TreeItem<SourceDataType> sourceRoot = new TreeItem<>(new SourceDataType("", ""));
-	@FXML
-	private TableColumn<SourceDataType, String> sourceColumn;
-	@FXML
-	private TableColumn<SourceDataType, String> modeColumn;
 	
 	private Main main;
 	private MainWindowController mainWindowController;