Improvements to tablet layout for #22