Fixing up issues in the viewer. Deployment has revealed more bugs that need to be addressed.
Added libraries as part of fix.