Updated for iOS 7, moved to storyboards