even more layout fixes