Cleaned up order form and changed it a bit