Cleanup and fixed interaction on touch