header motion refined
Merge branch 'working' into dev