fixing some issue on order form