Revert "Rolling back sidebar changes"

This reverts commit f88f0acbb463d92b5f1b2813ffeb66c71778e555.