Some more layout fixes.