Refactor templates, add Artists