UI changes and file updates