Improved order form \w confirmation & session