Move some prompts back in
Finish fixing up prompts