Add fix to menu.xml and fix navigation between fragments