Header moving part 2

Somehow the last commit wasn't complete. This is now the complete
commit.
Merge branch 'develop' of https://github.com/adam4813/Sigma into develop