Revert "Revert "Fix sidebar""

This reverts commit 71734067585da3f1b62843581d5414f2a3aaf35f.