Feature/improve headers

**WORK IN PROGRESS**