Redesign and fixes