Segue action with data and some refactors