fix some button styles and colspans, move edit buttons to left-hand column