Update modal to better handle multiple instances