diff --git a/lib/args4j.jar b/lib/args4j.jar
index a894c6e5..76a6d4c9 100644
Binary files a/lib/args4j.jar and b/lib/args4j.jar differ
diff --git a/lib/junit.jar b/lib/junit.jar
index 649b0b32..73392162 100644
Binary files a/lib/junit.jar and b/lib/junit.jar differ
diff --git a/lib/miglayout.jar b/lib/miglayout.jar
index fdbfd884..ad26e115 100644
Binary files a/lib/miglayout.jar and b/lib/miglayout.jar differ
diff --git a/lib/nekohtml.jar b/lib/nekohtml.jar
index 0be02315..19e169a9 100644
Binary files a/lib/nekohtml.jar and b/lib/nekohtml.jar differ
diff --git a/source/net/sourceforge/filebot/ui/AbstractSearchPanel.java b/source/net/sourceforge/filebot/ui/AbstractSearchPanel.java
index fc6b078a..58e848a2 100644
--- a/source/net/sourceforge/filebot/ui/AbstractSearchPanel.java
+++ b/source/net/sourceforge/filebot/ui/AbstractSearchPanel.java
@@ -38,7 +38,7 @@ import ca.odell.glazedlists.swing.AutoCompleteSupport;
 
 public abstract class AbstractSearchPanel<S, E> extends FileBotPanel {
 	
-	protected final JPanel tabbedPaneGroup = new JPanel(new MigLayout("nogrid, fill, insets 0"));
+	protected final JPanel tabbedPaneGroup = new JPanel(new MigLayout("nogrid, fill, insets 0", "align center", "[fill]8px[pref!]4px"));
 	
 	protected final JTabbedPane tabbedPane = new JTabbedPane();
 	
@@ -60,11 +60,12 @@ public abstract class AbstractSearchPanel<S, E> extends FileBotPanel {
 		tabbedPane.addTab("History", ResourceManager.getIcon("tab.history"), historyScrollPane);
 		
 		tabbedPaneGroup.setBorder(BorderFactory.createTitledBorder("Search Results"));
-		tabbedPaneGroup.add(tabbedPane, "grow, wrap 8px");
+		tabbedPaneGroup.add(tabbedPane, "grow, wrap");
 		
-		setLayout(new MigLayout("nogrid, fill, insets 10px 10px 15px 10px"));
-		add(searchTextField, "alignx center, gapafter indent");
-		add(new JButton(searchAction), "gap 18px, wrap 10px");
+		setLayout(new MigLayout("nogrid, fill, insets 10px 10px 15px 10px", "align center", "[pref!]10px[fill]"));
+		
+		add(searchTextField, "gapafter indent");
+		add(new JButton(searchAction), "gap 18px, wrap");
 		add(tabbedPaneGroup, "grow");
 		
 		searchTextField.getEditor().setAction(searchAction);
diff --git a/source/net/sourceforge/filebot/ui/panel/analyze/FileTree.java b/source/net/sourceforge/filebot/ui/panel/analyze/FileTree.java
index 53d67ad7..3f234f4f 100644
--- a/source/net/sourceforge/filebot/ui/panel/analyze/FileTree.java
+++ b/source/net/sourceforge/filebot/ui/panel/analyze/FileTree.java
@@ -153,11 +153,10 @@ public class FileTree extends JTree {
 			}
 			
 
-			@SuppressWarnings("unchecked")
 			public void actionPerformed(ActionEvent event) {
 				try {
-					for (File file : (Collection<File>) getValue("files")) {
-						Desktop.getDesktop().open(file);
+					for (Object file : (Collection<?>) getValue("files")) {
+						Desktop.getDesktop().open((File) file);
 					}
 				} catch (Exception e) {
 					Logger.getLogger("ui").log(Level.WARNING, ExceptionUtilities.getRootCauseMessage(e), e);
diff --git a/source/net/sourceforge/filebot/ui/panel/analyze/FileTreePanel.java b/source/net/sourceforge/filebot/ui/panel/analyze/FileTreePanel.java
index f6ac1615..dcbfd4bd 100644
--- a/source/net/sourceforge/filebot/ui/panel/analyze/FileTreePanel.java
+++ b/source/net/sourceforge/filebot/ui/panel/analyze/FileTreePanel.java
@@ -35,7 +35,7 @@ class FileTreePanel extends JComponent {
 		
 		setBorder(BorderFactory.createTitledBorder("File Tree"));
 		
-		setLayout(new MigLayout("insets 0, nogrid, fill", "align center"));
+		setLayout(new MigLayout("insets 0, nogrid, fill", "align center", "[fill][pref!]"));
 		add(new LoadingOverlayPane(new JScrollPane(fileTree), this), "grow, wrap 1.2mm");
 		add(new JButton(loadAction));
 		add(new JButton(clearAction), "gap 1.2mm, wrap 1.2mm");
diff --git a/source/net/sourceforge/filebot/ui/panel/analyze/SplitTool.java b/source/net/sourceforge/filebot/ui/panel/analyze/SplitTool.java
index 808c7295..f9e14333 100644
--- a/source/net/sourceforge/filebot/ui/panel/analyze/SplitTool.java
+++ b/source/net/sourceforge/filebot/ui/panel/analyze/SplitTool.java
@@ -43,7 +43,7 @@ public class SplitTool extends Tool<TreeModel> implements ChangeListener {
 		JSpinner spinner = new JSpinner(spinnerModel);
 		spinner.setEditor(new JSpinner.NumberEditor(spinner, "#"));
 		
-		setLayout(new MigLayout("insets 0, nogrid, fill", "align center"));
+		setLayout(new MigLayout("insets 0, nogrid, fill", "align center", "[fill][pref!]"));
 		
 		add(treeScrollPane, "grow, wrap");
 		
diff --git a/source/net/sourceforge/filebot/ui/panel/episodelist/EpisodeListPanel.java b/source/net/sourceforge/filebot/ui/panel/episodelist/EpisodeListPanel.java
index 8083d088..c4790b6c 100644
--- a/source/net/sourceforge/filebot/ui/panel/episodelist/EpisodeListPanel.java
+++ b/source/net/sourceforge/filebot/ui/panel/episodelist/EpisodeListPanel.java
@@ -63,7 +63,7 @@ public class EpisodeListPanel extends AbstractSearchPanel<EpisodeListClient, Epi
 		// add after text field
 		add(seasonSpinner, 1);
 		// add after tabbed pane
-		tabbedPaneGroup.add(new JButton(new SaveAction(new SelectedTabExportHandler())), "align center, wrap 5px");
+		tabbedPaneGroup.add(new JButton(new SaveAction(new SelectedTabExportHandler())));
 		
 		searchTextField.getSelectButton().addPropertyChangeListener(SelectButton.SELECTED_VALUE, selectButtonListener);
 		
diff --git a/source/net/sourceforge/filebot/ui/panel/list/ListPanel.java b/source/net/sourceforge/filebot/ui/panel/list/ListPanel.java
index 23b347c8..315592ae 100644
--- a/source/net/sourceforge/filebot/ui/panel/list/ListPanel.java
+++ b/source/net/sourceforge/filebot/ui/panel/list/ListPanel.java
@@ -68,7 +68,7 @@ public class ListPanel extends FileBotPanel {
 		fromSpinner.setEditor(new NumberEditor(fromSpinner, "#"));
 		toSpinner.setEditor(new NumberEditor(toSpinner, "#"));
 		
-		setLayout(new MigLayout("nogrid, fill, insets dialog", "align center"));
+		setLayout(new MigLayout("nogrid, fill, insets dialog", "align center", "[pref!][fill]"));
 		
 		add(new JLabel("Pattern:"), "gapbefore indent");
 		add(textField, "gap related, wmin 2cm");
diff --git a/source/net/sourceforge/filebot/ui/panel/rename/RenamePanel.java b/source/net/sourceforge/filebot/ui/panel/rename/RenamePanel.java
index d5079a69..2a5fb723 100644
--- a/source/net/sourceforge/filebot/ui/panel/rename/RenamePanel.java
+++ b/source/net/sourceforge/filebot/ui/panel/rename/RenamePanel.java
@@ -112,11 +112,14 @@ public class RenamePanel extends FileBotPanel {
 		renameButton.setVerticalTextPosition(SwingConstants.BOTTOM);
 		renameButton.setHorizontalTextPosition(SwingConstants.CENTER);
 		
-		// set fetch action popup
-		matchButton.setComponentPopupMenu(createFetchPopup());
+		// setup fetch action popup
+		ActionPopup fetchPopup = createFetchPopup();
+		
+		namesList.getListComponent().setComponentPopupMenu(fetchPopup);
+		matchButton.setComponentPopupMenu(fetchPopup);
 		matchButton.addActionListener(showPopupAction);
 		
-		setLayout(new MigLayout("fill, insets dialog, gapx 10px", null, "align 33%"));
+		setLayout(new MigLayout("fill, insets dialog, gapx 10px", "[fill][align center, pref!][fill]", "align 33%"));
 		
 		add(new LoadingOverlayPane(namesList, namesList, "28px", "30px"), "grow, sizegroupx list");
 		
diff --git a/source/net/sourceforge/filebot/ui/panel/sfv/ChecksumPanel.java b/source/net/sourceforge/filebot/ui/panel/sfv/ChecksumPanel.java
index 859c8867..d95d6913 100644
--- a/source/net/sourceforge/filebot/ui/panel/sfv/ChecksumPanel.java
+++ b/source/net/sourceforge/filebot/ui/panel/sfv/ChecksumPanel.java
@@ -57,7 +57,7 @@ public class ChecksumPanel extends FileBotPanel {
 		
 		table.setTransferHandler(new DefaultTransferHandler(transferablePolicy, exportHandler));
 		
-		JPanel contentPane = new JPanel(new MigLayout("insets 0, fill", "", "[fill]10px[nogrid, bottom]4px"));
+		JPanel contentPane = new JPanel(new MigLayout("insets 0, nogrid, fill", "", "[fill]10px[bottom, pref!]4px"));
 		contentPane.setBorder(new TitledBorder(getPanelName()));
 		
 		setLayout(new MigLayout("insets dialog, fill"));