Improve UI - fix references editor
Improve UI - limits