Added cancel feature

+ UI refinements