changes to swipe actions

refactor and changes to swipe methods