fixup! Implement sidebar