Edit form now uses table