Moved gestures to components