Code cleanup
Fix issue with context menu not closeable by back button