Move all pages to a single file
Making the popup a single page