added checks so click listener is not called on the swipes, changed expansion to be swipe left.