Index: src/edu/ucsd/cse70/ircclient/IRCClientWindow.java
===================================================================
--- src/edu/ucsd/cse70/ircclient/IRCClientWindow.java	(revision 150)
+++ src/edu/ucsd/cse70/ircclient/IRCClientWindow.java	(working copy)
@@ -81,33 +81,14 @@
 	 * Initializes the layout.
 	 */
 	private void initLayout() {
-		// create and set up the layout manager
-		// see http://java.sun.com/docs/books/tutorial/uiswing/layout/group.html
-		GroupLayout layout = new GroupLayout(getContentPane());
-		getContentPane().setLayout(layout);
-
-		// create a single sequential group for the vertical axis
-		SequentialGroup vGroup = layout.createSequentialGroup();
-		vGroup.addContainerGap();
-		vGroup.addComponent(scrollPane);
-		vGroup.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED);
-		vGroup.addComponent(userInputField,
-				GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
-		        GroupLayout.PREFERRED_SIZE);
-		vGroup.addContainerGap();
-		layout.setVerticalGroup(vGroup);
-
-		// create a parallel group within a sequential group for the horizontal axis
-		SequentialGroup hGroup = layout.createSequentialGroup();
-		hGroup.addContainerGap();
-		ParallelGroup h1 = layout
-				.createParallelGroup(GroupLayout.Alignment.LEADING);
-		h1.addComponent(scrollPane, GroupLayout.Alignment.LEADING);
-		h1.addComponent(userInputField);
-		hGroup.addGroup(h1);
-		hGroup.addContainerGap();
-		layout.setHorizontalGroup(hGroup);
-
+		getContentPane().setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS));
+		scrollPane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10),
+				BorderFactory.createEtchedBorder()));
+		add(scrollPane);
+		userInputField.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(0, 10, 10, 10),
+				BorderFactory.createEtchedBorder()));
+		userInputField.setMaximumSize(new Dimension(Short.MAX_VALUE, 50));
+		add(userInputField);
 		pack();
 	}