Fixed pop up issues