Cleaned up the ui.