Added prompts, ui tweaks