commit redesign changes (unfinished)