Refactor layout, add Text node element
Add append\prepend for inputs