More refactoring of portal views - move mainContent wrapper into core to share more widely