Feature new design and fixes