Redesign mostly finished