fixing modal issues