Restructures and fix pre-order pop-up