Cleaned up UI to be more straightforward based on initial user feedback.