Fixed some styling and user prompting issues