Fixed sidebar overflow scroll and search bar positioning
Merge remote-tracking branch 'origin/master'