Add next/previous buttons to touch version (some devices are shared mouse/touch) + refactor