Improved layour of prompts