UX enhancements on the modal page