Move order form into directive