Dsuo/refactor storyboard