Add scroll bar for Sidebar
Do not highlight selection on sidebar
Fix merge conflict