Cleanup and aesthetic changes.

* Cleaned up Angular structure.
* Found a better way to do the "or" line.
* Several small code cleanups.