completed markup for all pages
minor changes