Improving element helper. Fixing bugs in UI.