Revert "working of cancel button changed"

This reverts commit b2ec430ee30c5ca5264dac2235a87e67ae84855e.
Revert "Revert "working of cancel button changed""

This reverts commit 596f5d3e31aff2085ce442c1d2f3e183a635f041.
Merge branch 'master' of https://github.com/storeroom/production