Stop using @order in favor of order

order is passed as a local in every instance this partial is called

Change-Id: Ib58b40fb3640d3ab08cd15b2de7f5bcba5db62bc