Fix sidebar issue