Closes #316: ng-if isn't working properly so I changed to ng-show