Refactor gestures & delegate manager