Made changes for update.
Fix UnitLayout bug. Fix UnitLayout edit.