Changed button color, fixed rendering bugs
Merge branch 'master' of github.com:josephg/boilerplate