Upgrade Content modules
Improve multi language content editing