some more layout fixes