UI and layout tweaks.