headerview and sidebar changes"