New commit from

new design applied