Added more UI changes