diff --git a/org.intrace/.classpath b/org.intrace/.classpath
index e23cc42..1c1a3f8 100644
--- a/org.intrace/.classpath
+++ b/org.intrace/.classpath
@@ -7,8 +7,9 @@
 	<classpathentry kind="lib" path="lib/easymockclassextension-2.5.2.jar"/>
 	<classpathentry kind="lib" path="lib/easymock-2.5.2.jar"/>
 	<classpathentry kind="lib" path="lib/cglib-nodep-2.2.jar"/>
-	<classpathentry kind="lib" path="lib/miglayout-3.7-swt.jar"/>
 	<classpathentry kind="lib" path="lib/asm-debug-all-3.3.jar"/>
 	<classpathentry kind="lib" path="lib/swt-windows-3.5.2.jar"/>
+	<classpathentry kind="con" path="SWT_CONTAINER"/>
+	<classpathentry kind="lib" path="lib/miglayout-3.7.3.1-swt.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.intrace/lib/miglayout-3.7-swt.jar b/org.intrace/lib/miglayout-3.7-swt.jar
deleted file mode 100644
index 5d8e565..0000000
Binary files a/org.intrace/lib/miglayout-3.7-swt.jar and /dev/null differ
diff --git a/org.intrace/lib/miglayout-3.7.3.1-swt.jar b/org.intrace/lib/miglayout-3.7.3.1-swt.jar
new file mode 100644
index 0000000..65a5b95
Binary files /dev/null and b/org.intrace/lib/miglayout-3.7.3.1-swt.jar differ
diff --git a/org.intrace/src/org/intrace/client/gui/TraceWindow.java b/org.intrace/src/org/intrace/client/gui/TraceWindow.java
index 66107a2..abdc4c7 100644
--- a/org.intrace/src/org/intrace/client/gui/TraceWindow.java
+++ b/org.intrace/src/org/intrace/client/gui/TraceWindow.java
@@ -648,8 +648,8 @@ public class TraceWindow
       cancelButton.setLayoutData("grow,wrap");
       cancelButton.setVisible(false);
 
-      textOutput = new StyledText(composite, SWT.MULTI | SWT.WRAP
-                                             | SWT.V_SCROLL | SWT.BORDER);
+      textOutput = new StyledText(composite, SWT.MULTI | SWT.V_SCROLL
+                                             | SWT.H_SCROLL | SWT.BORDER);
       textOutput.setEditable(false);
       textOutput.setLayoutData("spanx,grow,wmin 0,hmin 0");
       textOutput.setBackground(Display.getCurrent()