Cancel Button and Other fixes(Orders)