Fixed prompts and ui components (part 2)