Minor layout tweaks