Fixing sidebar issues