Template fixes; begin work on order tracking