fix up model, view