Fix segues and passing of data to detail view