Feature/header refactor