Some updates to Ung-i pages
Updates to Editable Text and Ung I modules
Fix conflict