Dashboard bugfixes
Merge pull request #136 from BNoiZe/master

Dashboard bugfixes