Controls are now globally editable.

BUG: cannot leave game screen.
Fixed some merge issues.