Tidy up layout and pages.