fix modal issues