change layout structure
Merge Björn's commit

Conflicts:
	client/views/kita.html