layout fixes part 1