Fix a variety of sidebar issues