User edit/delete issue fix
Export to CSV updated to correct form