unify spacing between things, make some layout mods