redesign and fixes