Added swipe/working on save button