Working on the display/edit/delete