Added more functionality to user interface