Modify layout, icons. Remove unused files