changed things up css and files fixed ui
Merge branch 'master' of https://github.com/massiveclouds/hackathon