diff --git a/PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/PlanningPoker/views/OpenGameView.java b/PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/PlanningPoker/views/OpenGameView.java
index cd0d860d2e..e180de0a9d 100644
--- a/PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/PlanningPoker/views/OpenGameView.java
+++ b/PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/PlanningPoker/views/OpenGameView.java
@@ -9,9 +9,13 @@
  ******************************************************************************/
 package edu.wpi.cs.wpisuitetng.modules.PlanningPoker.views;
 
+import java.awt.BorderLayout;
 import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
 import java.awt.Font;
 import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -38,6 +42,8 @@
 import javax.swing.text.BadLocationException;
 import javax.swing.text.PlainDocument;
 
+import com.sun.awt.AWTUtilities;
+
 import edu.wpi.cs.wpisuitetng.janeway.config.ConfigManager;
 import edu.wpi.cs.wpisuitetng.modules.PlanningPoker.controller.AddPlanningPokerVoteController;
 import edu.wpi.cs.wpisuitetng.modules.PlanningPoker.controller.GetPlanningPokerGamesController;
@@ -250,46 +256,19 @@ private void populateWithNoCardDeckPanel() {
 		textArea.setBorder(BorderFactory.createLineBorder(Color.black, 1));
 		textArea.setColumns(2);
 		textArea.setRows(1);
+		textArea.setOpaque(false);
+		
+		JPanel card = new CardImgPanel();
+		
+		card.setPreferredSize(new Dimension(120, 170));
+		card.setBorder(javax.swing.BorderFactory
+				.createLineBorder(new java.awt.Color(153, 153, 153)));
 
-		PlayingCardJPanel card = new PlayingCardJPanel(
-				0, false);
-		////////////////////Bug is here!!!!
-		cards.add(card);
-		////////////////////
-		allCardsPanel.add(card, gridBagConstraints);
-		card.add(textArea);
-		card.repaint();
-		card.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent evt) {
-				PlayingCardJPanel clickedCard = (PlayingCardJPanel) evt
-						.getSource();
-				clickedCard.toggle();
-				updateEstimateTotal();// Vote value
-
-				// Requirement ID
-				// @TODO: Get selected requirement ID
-				int requirementID = requirements.get(
-						requirementList.getSelectedIndex()).getId();
-
-				// Game name
-				String gameName = game.getGameName();
-
-				// User name
-				String userName = ConfigManager.getConfig().getUserName();
-
-				// Vote
-				if (estimateNumberLabel.getText().equals("?")) {
-					submitButton.setEnabled(false);
-				} else {
-					submitButton.setEnabled(true);
-					ppv = new PlanningPokerVote(gameName, userName, Integer
-							.parseInt(estimateNumberLabel.getText()),
-							requirementID);
-				}
-			}
-		});
+		card.setLayout(new GridBagLayout());
+		GridBagConstraints gbc = new GridBagConstraints();
+		card.add(textArea, gbc);
 		
+		card.repaint();
 		allCardsPanel.add(card, gridBagConstraints);
 	}