Updates to model and view