modify layout and index MVC to use init mockup
NOTE that this doesn't include Joan's work on the mockup pages