removed Gesture Listener
some bugs fixed