Simplify the templates and improve the dl links