Merge.
Changed to ng-class to make the buttons appearance/disappearance animated.