Add HTMLViewerEx and clean up import statements