Make fixes to smooth out Constants.
Smooth out which buttons control what.