Refactor menu classes