Refactor menu.h