User view and model change
Changes to some specs, and views