Scrollbar in main menu when window is small
Merge commit 'HEAD@{4}' into develop