View and Controller changes to Measures.