More layout tweaking.