Added editable table and choosing table