More sidebar clean-up