Styles buttons. Layout fixes
Merge branch 'master' of github.com:ncpierson/CatchKey