Changed some styling, added cancel functionality