scrolling changed back to default, menu borders fixed
Merge remote-tracking branch 'origin/master'