Improved contact modal