ui-hotfix

Commits outline changes. Moved fields around.