more sidebar changes and ordering