MainActivity: Fixes for menu problem after a crash