Header-site refactored