adjust layout toward integration in odss app. (and some updates into version "6", which is still not complete/enabled)