Minor refactor
Added touchstart for mobile