Added refactors to menu module