small refactor on menues