adjusts in layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	pages/startpage.php