rewrite Interface elements section to match current behavior #1