Tweaks some stuff and someone else is going to have to rebase all this stuff together...
Merge branch 'master' of https://github.com/Zomega/dashboard
Merge pull request #35 from Zomega/master

Again, sorry for the bad practice, merging for quickness.