Fix sidebar issues