Improving element helper. Fixing bugs in UI.
Merge branch 'master' into release