today view
Merge branch 'ui_actions'

Conflicts:
	plots.html
style fix