swipe functionality and small changes