issue#504 - brought Edit and Delete buttons together
Merge pull request #506 from igoryen/issue#504

issue#504 - brought Edit and Delete buttons together