fixed the cancel order button
updated the login