merging redesign branch