Positioning done.
Fix for data-scale
Adjusted tests after new positioning.
Whitespace orgy.
Oups