Refactor code in Cancel button
Merge branch 'development' of https://github.com/bashantad/Industry-project into development