refactor menu tables