Setting up to new design
Merge remote-tracking branch 'origin/smidt' into Flemming