more layout fixes