new design and minor fixes