Updated storyboard
Merges gui changes