Refactored DOI view