order form and emails improvements