Added more to the UI