Make category destination editable
Placeholder for preferred words
Merge branch 'refs/heads/develop' into tv