made changes in layouts and part