Design and layout tweaks