Merge branch 'remove-wdn' into 'master'

Remove WDN references and other layout cleanup

See merge request !17
1 job for master in 2 minutes and 12 seconds (queued for 7 seconds)