Cleanup header
Refactor gestures so they work.