issue#504 - brought Edit and Delete buttons together