diff --git a/build.xml b/build.xml
index 2324abae79..0a8e2f29ca 100644
--- a/build.xml
+++ b/build.xml
@@ -25,6 +25,13 @@
       <get src="http://search.maven.org/remotecontent?filepath=org/codehaus/groovy/groovy-all/2.1.7/groovy-all-${groovy-version}.jar" 
            dest="${lib}/groovy-all-${groovy-version}.jar" 
            skipexisting="true" />
+      <echo message="downloading MigLayout to ${lib}"/>
+      <get src="http://repo1.maven.org/maven2/com/miglayout/miglayout-core/4.2/miglayout-core-4.2.jar" 
+           dest="${lib}/miglayout-core-4.2.jar" 
+           skipexisting="true" />  	
+      <get src="http://repo1.maven.org/maven2/com/miglayout/miglayout-swing/4.2/miglayout-swing-4.2.jar" 
+           dest="${lib}/miglayout-swing-4.2.jar" 
+           skipexisting="true" />
   </target>
 
   <!-- init - Create temporary directory to build the program -->
@@ -57,8 +64,8 @@
     <jar destfile="release/Magarena.jar" basedir="build" includes="**/*.*">
       <manifest>
         <attribute name="Main-Class" value="magic.MagicMain" />
-      	<attribute name="SplashScreen-Image" value="magic/data/textures/logo.jpg" />
-        <attribute name="Class-Path" value="lib/groovy-all-${groovy-version}.jar" />
+        <attribute name="SplashScreen-Image" value="magic/data/textures/logo.jpg" />
+        <attribute name="Class-Path" value="lib/groovy-all-${groovy-version}.jar lib/miglayout-core-4.2.jar lib/miglayout-swing-4.2.jar" />
       </manifest>
     </jar>
   </target>
diff --git a/src/magic/ui/viewer/GameDuelViewer.java b/src/magic/ui/viewer/GameDuelViewer.java
index a90a25b901..7aa6eaf6ea 100644
--- a/src/magic/ui/viewer/GameDuelViewer.java
+++ b/src/magic/ui/viewer/GameDuelViewer.java
@@ -32,7 +32,7 @@ public class GameDuelViewer extends JPanel implements ChangeListener {
         duelViewer=new DuelViewer(game.getDuel());
 
         phaseStepViewer = new PhaseStepViewer();
-        phaseStepViewer.setBorder(BorderFactory.createMatteBorder(0, 1, 0, 1, Color.BLACK));
+        phaseStepViewer.setBorder(BorderFactory.createMatteBorder(1, 0, 0, 0, Color.BLACK));
         phaseStepViewer.setOpaque(false);
 
         setSize(320,125);
@@ -40,6 +40,7 @@ public class GameDuelViewer extends JPanel implements ChangeListener {
 
         titleBar=new TitleBar("");
         add(titleBar,BorderLayout.NORTH);
+        titleBar.setBorder(BorderFactory.createMatteBorder(1, 1, 0, 1, Color.BLACK));
 
         cardLayout=new CardLayout();
         cardPanel=new JPanel(cardLayout);
@@ -50,11 +51,9 @@ public class GameDuelViewer extends JPanel implements ChangeListener {
         tabSelector=new TabSelector(this,false);
         tabSelector.addTab(IconImages.MESSAGE,"Message");
         tabSelector.addTab(IconImages.PROGRESS,"Progress");
-        tabSelector.setBorder(BorderFactory.createMatteBorder(1, 1, 1, 1, Color.BLACK));
         titleBar.add(tabSelector,BorderLayout.EAST);
         titleBar.add(phaseStepViewer,BorderLayout.SOUTH);
 
-        //add(phaseStepViewer, BorderLayout.SOUTH);
     }
 
     public GameViewer getGameViewer() {
diff --git a/src/magic/ui/viewer/PhaseStepViewer.java b/src/magic/ui/viewer/PhaseStepViewer.java
index 15285614dd..abac47302e 100644
--- a/src/magic/ui/viewer/PhaseStepViewer.java
+++ b/src/magic/ui/viewer/PhaseStepViewer.java
@@ -1,13 +1,10 @@
 package magic.ui.viewer;
 
 import java.awt.Color;
-import java.awt.Dimension;
-
-import javax.swing.Box;
-import javax.swing.BoxLayout;
 import javax.swing.JLabel;
 import javax.swing.SwingConstants;
 
+import net.miginfocom.swing.MigLayout;
 import magic.model.phase.MagicPhaseType;
 import magic.ui.theme.Theme;
 import magic.ui.theme.ThemeFactory;
@@ -26,6 +23,7 @@ public class PhaseStepViewer extends TexturedPanel {
     }
 
     private void setMyLayout() {
+        setLayout(new MigLayout("insets 3 5 3 5"));
         setPhaseStepIndicator("UN", "Beginning Phase : Untap Step");
         setPhaseStepIndicator("UP", "Beginning Phase : Upkeep Step");
         setPhaseStepIndicator("DR", "Beginning Phase : Draw Step");
@@ -62,7 +60,7 @@ public class PhaseStepViewer extends TexturedPanel {
         lbl.setFont(FontsAndBorders.FONT1);
         lbl.setHorizontalAlignment(SwingConstants.CENTER);
         lbl.setForeground(Color.GRAY);
-        add(lbl);
+        add(lbl, "w 100%");
     }
 
     public void setPhaseStep(MagicPhaseType gamePhaseType) {