Make minor template adjustments
Make category order optional