@moollaza @jagtalon I agree that the HTML should be refactored into a template there. I can put that in a separate pull request as time permits.