diff --git a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/PadSettingsViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/PadSettingsViewController.java
index 90c49a89b0ed5b8325f6afa207d62357aa8af4ec..666f040a8f8db89c0b0b34f02815909831afb94e 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/PadSettingsViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/PadSettingsViewController.java
@@ -28,11 +28,11 @@ import java.util.List;
 
 public class PadSettingsViewController extends NVC implements IPadSettingsViewController {
 
-	private Pad pad;
+	private final Pad pad;
 
 	@FXML
 	private TabPane tabPane;
-	private List<PadSettingsTabViewController> tabs = new ArrayList<>();
+	private final List<PadSettingsTabViewController> tabs = new ArrayList<>();
 
 	private Control pathLookupButton;
 
@@ -50,15 +50,15 @@ public class PadSettingsViewController extends NVC implements IPadSettingsViewCo
 
 		if (pad.getContent() != null) {
 			try {
-				// Get Pad Type specific tab
-				String type = pad.getContent().getType();
-				PadContentRegistry registry = PlayPadPlugin.getRegistries().getPadContents();
+				final String type = pad.getContent().getType();
+				final PadContentRegistry registry = PlayPadPlugin.getRegistries().getPadContents();
 
-				PadContentFactory padContentFactory = registry.getFactory(type);
-				PadSettingsTabViewController contentTab = padContentFactory.getSettingsViewController(pad);
+				final PadContentFactory padContentFactory = registry.getFactory(type);
+				final PadSettingsTabViewController contentTab = padContentFactory.getSettingsViewController(pad);
 
-				if (contentTab != null)
+				if (contentTab != null) {
 					addTab(contentTab);
+				}
 			} catch (NoSuchComponentException e) {
 				Logger.error(e);
 			}
@@ -77,7 +77,7 @@ public class PadSettingsViewController extends NVC implements IPadSettingsViewCo
 	}
 
 	private void setupPathLookupButton() {
-		PathLookupListener pathLookupListener = new PathLookupListener();
+		final PathLookupListener pathLookupListener = new PathLookupListener();
 
 		if (pad.getContent() != null) {
 			final ObservableList<MediaPath> paths = pad.getPaths();
@@ -124,11 +124,6 @@ public class PadSettingsViewController extends NVC implements IPadSettingsViewCo
 		getStageContainer().ifPresent(nvcStage -> nvcStage.getStage().setTitle(title));
 	}
 
-	@Override
-	public void init() {
-
-	}
-
 	@Override
 	public void initStage(Stage stage) {
 		stage.getIcons().add(PlayPadPlugin.getInstance().getIcon());
diff --git a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/PathLookupListener.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/PathLookupListener.java
index 148f385f1de2c8c9018086a80087c4ef6a8ba314..a91ae9ee9808209aad70447610fd5c687048462a 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/PathLookupListener.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/PathLookupListener.java
@@ -4,28 +4,19 @@ import de.thecodelabs.utils.application.system.NativeApplication;
 import de.tobias.playpad.pad.mediapath.MediaPath;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
+import javafx.scene.Node;
 import javafx.scene.control.Button;
-import javafx.scene.control.MenuItem;
-
-import java.nio.file.Path;
 
 public class PathLookupListener implements EventHandler<ActionEvent> {
 
 	@Override
 	public void handle(ActionEvent event) {
 		Object source = event.getSource();
-		if (source instanceof Button) {
-			// single path
+		if (source instanceof Node) {
 			Object userData = ((Button) source).getUserData();
 			if (userData instanceof MediaPath) {
 				showPath((MediaPath) userData);
 			}
-		} else if (source instanceof MenuItem) {
-			// multiple path
-			Object userData = ((MenuItem) source).getUserData();
-			if (userData instanceof Path) {
-				showPath((MediaPath) userData);
-			}
 		}
 	}