Updated button display with ng-show, and additional minor fixes.