Final bugfixes with header movement