added swipe behaviour + cleaned spaces