Improve storyboard
Refactoring