Added a pushViewController custom storyboard segue and bug fix on popToViewController method