Review logic of menu link to suggestion. #40