Refactor

using ng-show and ng-hide