Added modified to text container, and others refactors