Cleaned up the UI