Fix SideMenu
Merge origin/master