Multiple fixes to the Grid System for tablet view.
Merge pull request #1710 from pjackson28/master

Multiple fixes to the Grid System for tablet view