Model Update: Grouped production views

Also worked on executive review