various style and layout tweaks