layout and minor tweaks