Major updates to touch controls