Improve layouts/wording. Add helpful user messages.