Tidy up app and pages
Page tidy up