Modify Table Layout to fix Bug #2