A couple more layout tweaks.