improvements and fixes to editable areas