Merge pull request #99 from jamesongamble/master

Fixes extra space between active
Editing modal CSS
Made a few changes
Fix
Fix2
Merge pull request #100 from SpaceProphet/dashboard

Dashboard