make Controller.layout public, again, although it should be private :/