Some more layout fixes