Added better display logic for prompt