Merge pull request #90 from SpaceProphet/dashboard

Dashboard fixes
Modal displays correct data