more and more layout fixes