styl refactor + touch styles