Feature/header loading improvements