some changes. box on edit forms move up when deleting

-ES
Merge remote-tracking branch 'origin/master'