Added detection button, and ng-disable attr