Last fixes on storyboard