Changed a lot with storyboard