Pop-up is mostly finished

Still need to tweak a few things