Lots of fixes and refactors
small changes
Merge pull request #90 from SpaceProphet/dashboard

Dashboard fixes