[Refactor] Sidebar cleanup (and a bit more that's related)

[Refactor] Sidebar cleanup (and a bit more that's related) #5827