Updated Measure and Keypad

Ssdasdfas