Series of small view and model changes.