cleaned up some code
added aside buttons
added styling
merging to master
blah
fixed
Merge branch 'master' into styling
Merge pull request #16 from JeuelyFish/styling

Styling