Redesign fixes