Refactored MenuActivity