Refactored the rest of the views.
Cleaned up Router most of the rest of the way, and fixed up a few odds and ends.