Gesture Fix

Got all gestures working properly. Still want to fix button
implementation.