Various layout tweaks.