Added the additional fixes to tablet view recommended in #1529.
Merge pull request #1718 from pjackson28/master

Added the additional fixes to tablet view recommended in #1529