First-version
Fixing of the edit view