Reorganisation of UI.
fix for callstateless.