Bug fix #574
Merge pull request #591 from aRn0D/dashboard-design

[WIP] Bug fix #574