Readded popup stuff, trying to stay jfx2.2 compatible