Properly handle header views