15 Commits (bugfix/header_elements)