diff --git a/src/org/ohdsi/rabbitInAHat/MappingPanel.java b/src/org/ohdsi/rabbitInAHat/MappingPanel.java
index 57fcfb8c..d99a0b13 100644
--- a/src/org/ohdsi/rabbitInAHat/MappingPanel.java
+++ b/src/org/ohdsi/rabbitInAHat/MappingPanel.java
@@ -210,10 +210,11 @@ public void paint(Graphics g) {
 			g2d = (Graphics2D) g;
 		else
 			g2d = (Graphics2D) offscreen.getGraphics();
-
+		g2d.setBackground(Color.WHITE);
+		g2d.clearRect(0, 0, getWidth(), getHeight());
+		
 		RenderingHints rh = new RenderingHints(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
-		g2d.setRenderingHints(rh);
-		// g2d.clearRect(0, 0, getWidth(), getHeight());
+		g2d.setRenderingHints(rh); 
 
 		addLabel(g2d, "Source", sourceX + ITEM_WIDTH / 2, HEADER_HEIGHT / 2);
 		addLabel(g2d, "CDM", cdmX + ITEM_WIDTH / 2, HEADER_HEIGHT / 2);
diff --git a/src/org/ohdsi/rabbitInAHat/RabbitInAHatMain.java b/src/org/ohdsi/rabbitInAHat/RabbitInAHatMain.java
index ef69a466..8f74f1a6 100644
--- a/src/org/ohdsi/rabbitInAHat/RabbitInAHatMain.java
+++ b/src/org/ohdsi/rabbitInAHat/RabbitInAHatMain.java
@@ -17,6 +17,7 @@
  ******************************************************************************/
 package org.ohdsi.rabbitInAHat;
 
+import java.awt.Color;
 import java.awt.Cursor;
 import java.awt.Dimension;
 import java.awt.Image;
@@ -87,6 +88,8 @@ public void windowClosing(WindowEvent e) {
 		scrollPane1.setBorder(new TitledBorder("Tables"));
 		scrollPane1.getVerticalScrollBar().setUnitIncrement(16);
 		scrollPane1.setAutoscrolls(true);
+		scrollPane1.setOpaque(true);
+		scrollPane1.setBackground(Color.WHITE);
 		frame.addKeyListener(tableMappingPanel);
 
 		fieldMappingPanel = new MappingPanel(etl.getTableToTableMapping());