add fix menu
Merge branch 'develop'