UI improvements
Merge branch 'dev' into dev-ui

Conflicts:
	app.db
	app/templates/base.html