Refactor right side bar, see you, BRs.
Merge pull request #4793 from Flaburgan/refactor-right-side-bar

Refactor right side bar, see you, BRs.