ViewCertActivity cleanup

Closes #547