Added controlbox and save prompts

Such small changes
wow
Fix merge conflicts