fix storyboard
fix storyboard
fix screen
fix bugs