Simplifying table construction code a little bit
Adding edit row to the table, addresses #643