Added UIPrompt improvements