Fix up some logic and buttons for the prompts