Final touches on Order template