Moving header to a more logical location