bar view update, form controller
Merge branch 'feature/bar_view' into develop

Conflicts:
	css/style.css