Modifications to state system
Prevent flash of old values when button pushed
Mathematica equations