layout updates
update
Merge remote-tracking branch 'origin/new_development' into new_development

Conflicts:
	web/index.html
	web/resources/js/simulation.js