Touch controls improvements