Trying to clean up the UI