Merge pull request #1 from rwhaling/master

Merge stuff
Layout fixes for table
Merge pull request #4 from pleonard212/master

merge layout fixes