further work on standard page, tidy up points before design review
resolving merge conflict