Fix some errors on edit container
Merge pull request #28 from sergey-dryabzhinsky/fix-edit-container

Fix some errors on edit container