CLC-3332 - Replace ngShow with ngIf whenever possible
https://jira.ets.berkeley.edu/jira/browse/CLC-3332
Merge pull request #2185 from christianv/CLC-3332

CLC-3332 - Replace ngShow with ngIf whenever possible