Simplified the demo storyboard (un-sam'ed it). Also re-ordered the creation of the subviews to avoid doing things once when super == nil and when we in fact know the superview.