Started revising the UI