Fixed row/span padding issue, added edit/delete buttons