added cancel buttons and more