Fixes for clearing screen and duplicate prompts