Feature/header improvements