Update the UI to expected approach. Fixes #2053.
Merge branch 'development' of https://github.com/virtual-world-framework/vwf into development