More layout refactoring for tablets