Redesign & fix.