Modified to use the proper modal window