Swift changes

Was trying to avoid embedding logic in the template. I guess I can use an ng-if if you prefer, and admittedly it's not much logic.