fix: menu labeling and reorder