Fixes to the sidebar macro