Rework tokens for new UI
Clean up of new UI.
Fix bug causing double jump
Correct bugs in mobile controls