Made the Pop-Up better