bug fixes in click-to-edit