Small changes to main page and full page template