Did some changes on the sidemenu.
Merge remote-tracking branch 'origin/master'