Improvement to modal popup