Redesign and fixes.