Substantial layout and model/view call changes