Added Menu Refactors