Continued to refactor ETD for Aristotle Library Apps