Cleanup
Dashboard part 1
Fxup
Merge pull request #38 from ssrb/master

Dashboard