Make the UI Clearer