Fixes to the editable text components