UI changes and removed useless files