Merged measure, changed measure colors, removed extra if from wall