Played with xcode segue workarounds and reverted