Added the additional fixes to tablet view recommended in #1529