Modified the popup form