added ipad version, added undo button, fixed swipeUp to combine correctly