Adjusting the UI per Alex's recommendations