More fixes. Things are horribly broken because the storyboards are not as
fleshed out as the xibs formerly were.