refine upper button message
merge g origin master