Fix
Add gesture recognizer
Refactor