Revert "Revert "Squash sidebar commits from ChaOS""

This reverts commit d9182f825b8338f6facf8fff207d305f9195aa42.