More UI and Style

I've added that last commit because my diff was showing I was deleting package.json, which I didn't mean to do. So I added it back in there. 

Now all the diffs are just style and minor js.

Nice.