Added Cancel button
Fixed bugs