Fixed conditional horizontal scrollbar
Merge remote-tracking branch 'UMS/master' into UMS-master