Code cleanup, correcting namespaces.

Refactoring 'Viewer' out of namespaces in the common library.  Some
cleanup in the form code.