Added onEnter and onExit handling and iPhone storyboard