Upgrade onepage design