UI Redesign: I broke everything