MainMenu + UserMenu Improvement
Merge origin/master