Restructure to use a table for improved layout + in place editing instead of confirms