Add swipe gestures, organize keybindings