Nail: modified the menu according to Michael's instructions