Cleaned up logo viewer code