Upgrade to use @lazy var instantiation of views