Fix missing options
Fix bugs in the storyboard