added cancel option to all views, comments to the code