some layout/grid tweaks