fix issue
refine menu to bottom
Merge remote-tracking branch 'origin/master'
add menu popup