more layout changes and file deletions