Reorganisation of UI.
fix for callstateless.
Merge branch 'develop' into poc-6+