Merge pull request #13 from Bjwebb/master

Updates for the dashboard