Prepared big change for menu/page structure