Cleanup after merge and refactor header

We integrate the new background sprite and change the claim
integration