Revert "Storyboard changes"

This reverts commit 5d7f6493056a1498e0bc2829dfa02871c4450e3f, reversing
changes made to d71242fea9b2ad0a8e93f6570dce4c4427c62b7f.
Fix to storyborad