Modified so that not all columns are put into a single row.
Merge pull request #13 from kevinbluett/design-fix

Modified so that not all columns are put into a single row