Reverted unwanted storyboard changes
Merge branch 'dennis' into chris