Fix gestures on view, minor fixes and cleanups