positioning bug and .text-editable
merge