Completing MenuActivity + refactoring