Small updates to model and item views