layout changes

layout changes
Merge branch 'John'

Conflicts:
	js/main.js