Add more Pages and tidy up HTML tags