New commit from Hossain

New design applied