Improve touch controls