remove header modifications, fixed popover error