main-menu improve
Merge branch 'Near'