Pop-ups fixed

Pop-ups fixed