Jump touchscreen controls

Some code fixups too