Fixes #15 - moved stuff around in the storyboard