CDS layout

Adapting the templates and strings to fit the CDS Next look'n'feel.

Ping @kasioumis and @drjova for a review then merge. thx