WIP consolidation of admin/portal layouts and headings