Pin header to content top, not screen top
Combine header pinning with height recalc
Fix merge conflict