Removing buttons, adding gestures