Tidy up of pages templates