Work on making Pop-up fully dynamic