Refactor, more support for dk website.