change the menu location and  rendering logic
Merge remote-tracking branch 'origin/develop' into develop