Cleaning code and bug fix

Fixed bug in SwipeListView event listeners