(refactor) Change ng-click to on-tap