Fixing bugs
Add grab gesture