Header buttons, fixes #2