Adjusted column order to match mockup