Fix template error
Add record edit, delete popover