UX improvements, added more prompts