Redesign fixes part 2