formatting and layout tweaks