Added more functionality to UI