Display scrollbar all the time to make sure content does not shift when clicking on menu
Merge remote-tracking branch 'origin/master'