fix menu bar
fix menu bar #1
fix menu bar #2
Merge branch 'add_users_avatar'