Some more layout fixes...