Re-done touchscreen controls