ng-click/ng-show issue after refactor
merging conflicted files