Issue #2 - Add event in button return to close app