Dashboard improvements
Merge branch 'develop' of https://github.com/simcen/alert_manager into develop