UI changes + excess file removal