diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
index 11224d83630..30964f26a4f 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
@@ -44,11 +44,7 @@ import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.swing.JComponent;
-import javax.swing.JFileChooser;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.Timer;
+import javax.swing.*;
 import javax.swing.filechooser.FileFilter;
 
 import mage.cards.Card;
@@ -64,6 +60,7 @@ import mage.components.CardInfoPane;
 import mage.game.GameException;
 import mage.sets.Sets;
 import mage.view.CardView;
+import sun.swing.SwingUtilities2;
 
 /**
  *
@@ -298,6 +295,7 @@ public class DeckEditorPanel extends javax.swing.JPanel {
 					cardTableSelector.setVisible(false);
 					cardSelector.setVisible(true);
 					jSplitPane1.setTopComponent(cardSelector);
+					jSplitPane1.setDividerLocation(0.6);
 					jSplitPane1.revalidate();
 					jSplitPane1.repaint();
 				}
@@ -316,6 +314,7 @@ public class DeckEditorPanel extends javax.swing.JPanel {
 					cardTableSelector.setVisible(true);
 					cardSelector.setVisible(false);
 					jSplitPane1.setTopComponent(cardTableSelector);
+					jSplitPane1.setDividerLocation(0.6);
 					jSplitPane1.revalidate();
 					jSplitPane1.repaint();
 				}
@@ -325,7 +324,14 @@ public class DeckEditorPanel extends javax.swing.JPanel {
         jSplitPane1.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT);
         jSplitPane1.setResizeWeight(0.5);
         jSplitPane1.setTopComponent(cardSelector);
-        jSplitPane1.setRightComponent(deckArea);
+        jSplitPane1.setBottomComponent(deckArea);
+
+		SwingUtilities.invokeLater(new Runnable() {
+			@Override
+			public void run() {
+				jSplitPane1.setDividerLocation(0.6);
+			}
+		});
 
         bigCard.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(0, 0, 0)));
 
diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/table/CardTableSelector.java b/Mage.Client/src/main/java/mage/client/deckeditor/table/CardTableSelector.java
index 8a592e8737e..d8a1080fbca 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/table/CardTableSelector.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/table/CardTableSelector.java
@@ -38,8 +38,7 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.UUID;
 
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JTable;
+import javax.swing.*;
 import javax.swing.table.DefaultTableCellRenderer;
 
 import mage.Constants.CardType;
@@ -56,7 +55,7 @@ import mage.view.CardsView;
 
 /**
  *
- * @author BetaSteward_at_googlemail.com
+ * @author BetaSteward_at_googlemail.com, nantuko
  */
 public class CardTableSelector extends javax.swing.JPanel implements ComponentListener {
 
@@ -319,7 +318,7 @@ public class CardTableSelector extends javax.swing.JPanel implements ComponentLi
         mainTable.setModel(mainModel);
 		mainTable.setForeground(Color.white);
 		DefaultTableCellRenderer myRenderer = (DefaultTableCellRenderer) mainTable.getDefaultRenderer(String.class);
-		myRenderer.setBackground(new Color(0, 0, 0, 100)); 
+		myRenderer.setBackground(new Color(0, 0, 0, 100));
 		mainTable.getColumnModel().getColumn(0).setMaxWidth(0);
 		mainTable.getColumnModel().getColumn(0).setPreferredWidth(10);
 		mainTable.getColumnModel().getColumn(1).setPreferredWidth(110);
@@ -598,7 +597,7 @@ public class CardTableSelector extends javax.swing.JPanel implements ComponentLi
     private javax.swing.JRadioButton rdoWhite;
     private javax.swing.JToolBar tbColor;
     private javax.swing.JToolBar tbTypes;
-   
+
 	@Override
 	public void componentResized(ComponentEvent e) {
 		if (cbSortBy.getSelectedItem() instanceof SortBy)