Fixes to sidebar again