Lots of layout refactoring that probably broke things. Display page refinements.
Typo merge