Changes to CSS and views
Merge branch 'master' of github.com:connorfinnerty/balance-hack