Fixed back button functionality
Added working notification listener