fix(menu): Fix issues with PR based on comments