Split templating into separate class
Fix up Admin page delegation