Added back / cancel functionality to more prompts
More code tweaks, fixes and improvements