WIP CDS layout

Adapting the templates to fit the CDS Next look'n'feel.

**Work in progress** do not merge.