More layout tweaks.