Added Menu code refactors