unify spacing between things, make some layout mods
Merge branch 'master' into production