Add ItemsAction_CancelButtonClicked and refactoring