cleanup, sidebar changes