Dashboard manager vol 2

Nikola's #49 rebased