Layout tweaks
Merge branch 'master' of github.com:rbjarnason/active-citizen