diff --git a/api-gateway/src/app.controller.ts b/api-gateway/src/app.controller.ts
index adff4cf7..5ebc741f 100644
--- a/api-gateway/src/app.controller.ts
+++ b/api-gateway/src/app.controller.ts
@@ -82,6 +82,35 @@ export class AppController {
     );
   }
 
+  @Put('user/updateGuard/:id')
+  updateGuard(
+    @Param('id') id: string,
+    @Body('dni') dni: string,
+    @Body('name') name: string,
+    @Body('last_name') last_name: string,
+    @Body('email') email: string,
+    @Body('phone') phone: number,
+    @Body('password') password: string,
+    @Body('user_type') user_type: string,
+    @Body('status') status: string,
+    @Body('date_entry') date_entry: Date,
+    @Body('community_id') community_id: string,
+  ) {
+    return this.appService.updateGuard(
+      id,
+      dni,
+      name,
+      last_name,
+      email,
+      phone,
+      password,
+      user_type,
+      status,
+      date_entry,
+      community_id,
+    );
+  }
+
   @Put('user/updateUser/:id')
   updateUser(
     @Param('id') id: string,
diff --git a/api-gateway/src/app.service.ts b/api-gateway/src/app.service.ts
index 965b4005..9307433c 100644
--- a/api-gateway/src/app.service.ts
+++ b/api-gateway/src/app.service.ts
@@ -89,6 +89,38 @@ export class AppService {
       .pipe(map((message: string) => ({ message })));
   }
 
+  updateGuard(
+    _id: string,
+    dni: string,
+    name: string,
+    last_name: string,
+    email: string,
+    phone: number,
+    password: string,
+    user_type: string,
+    status: string,
+    date_entry: Date,
+    community_id: string,
+  ) {
+    const pattern = { cmd: 'updateGuard' };
+    const payload = {
+      id: _id,
+      dni: dni,
+      name: name,
+      last_name: last_name,
+      email: email,
+      phone: phone,
+      password: password,
+      user_type: user_type,
+      status: status,
+      date_entry: date_entry,
+      community_id: community_id,
+    };
+    return this.clientUserApp
+      .send<string>(pattern, payload)
+      .pipe(map((message: string) => ({ message })));
+  }
+
   //POST parameter from API
   createAdminSystem(dni: string, name: string, last_name: string, email: string, phone: number
     , user_type: string, status: string, date_entry: Date) {
diff --git a/devshell.toml b/devshell.toml
index 046ba4a0..3713822c 100644
--- a/devshell.toml
+++ b/devshell.toml
@@ -6,3 +6,8 @@ help = "Per project developer environments"
 [[commands]]
 package = "nodejs"
 help = "Node.js"
+
+[[commands]]
+package = "nodePackages.expo-cli"
+help = "Expo CLI"
+
diff --git a/servicio-usuarios/src/users/users.controller.ts b/servicio-usuarios/src/users/users.controller.ts
index a13bae7c..05c13169 100644
--- a/servicio-usuarios/src/users/users.controller.ts
+++ b/servicio-usuarios/src/users/users.controller.ts
@@ -69,6 +69,11 @@ export class UsersController {
     return this.userService.update(user.id, user);
   }
 
+  @MessagePattern({ cmd: 'updateGuard' })
+  updateGuard(@Payload() guard: UserDocument) {
+    return this.userService.update(guard.id, guard);
+  }
+
   @MessagePattern({ cmd: 'removeUser' })
   remove(@Payload() id: string) {
     let dni = id['dni'];
diff --git a/web-ui/web-react/src/components/GuardasSeguridad.js b/web-ui/web-react/src/components/GuardasSeguridad.js
index 1b2f069f..1654a330 100644
--- a/web-ui/web-react/src/components/GuardasSeguridad.js
+++ b/web-ui/web-react/src/components/GuardasSeguridad.js
@@ -13,582 +13,655 @@ import { faAt } from '@fortawesome/free-solid-svg-icons';
 import { faIdCardAlt } from '@fortawesome/free-solid-svg-icons';
 import { faCircleQuestion } from '@fortawesome/free-solid-svg-icons';
 import { useCookies } from "react-cookie";
+import classNames from 'classnames';
 
 const GuardasSeguridad = () => {
 
-    let emptyGuarda = {
-        _id: null,
-        dni: '',
-        name: '',
-        last_name: '',
-        email: '',
-        phone: '',
-        password: '',
-        user_type: '1',
-        status: '1',
-        status_text: '',
+  let emptyGuarda = {
+    _id: null,
+    dni: '',
+    name: '',
+    last_name: '',
+    email: '',
+    phone: '',
+    password: '',
+    user_type: '1',
+    status: '1',
+    status_text: '',
+    date_entry: Date.now(),
+    community_id: '',
+  };
+
+  const [listaGuardas, setListaGuardas] = useState([]);
+  const [urlFetch, setUrlFetch] = useState('http://localhost:4000/user/findGuards/');
+  const [guarda, setGuarda] = useState(emptyGuarda);
+  const [selectedGuardas, setSelectedGuardas] = useState(null);
+  const [globalFilter, setGlobalFilter] = useState(null);
+  const [deleteGuardaDialog, setDeleteGuardaDialog] = useState(false);
+  const [deleteGuardasDialog, setDeleteGuardasDialog] = useState(false);
+  const [saveButtonTitle, setSaveButtonTitle] = useState("Registrar");
+  const toast = useRef(null);
+  const dt = useRef(null);
+  const [cookies, setCookie] = useCookies();
+  const [changeStatusGuardDialog, setChangeStatusGuardDialog] = useState(false);
+  const [guardDialog, setGuardDialog] = useState(false);
+  const [submitted, setSubmitted] = useState(false);
+
+
+  async function listaGuardasF() {
+    let nombres = await fetch((urlFetch + cookies.community_id), { method: 'GET' });
+    let listaGuardasRes = await nombres.json();
+    let data = await listaGuardasRes.message.filter(
+      (val) => val.status != -1,
+    )
+    await data.map((item) => {
+      if (item.status == '1') {
+        item.status_text = 'Activo';
+      } else if (item.status == '0') {
+        item.status_text = 'Inactivo';
+      }
+    })
+    setListaGuardas(await data);
+  }
+
+  useEffect(() => {
+    listaGuardasF();
+  }, [])
+
+  function registrarGuarda() {
+    var data = {
+      dni: document.getElementById('dni').value,
+      name: document.getElementById('name').value,
+      last_name: document.getElementById('last_name').value,
+      email: document.getElementById('email').value,
+      phone: document.getElementById('phone').value,
+      password: document.getElementById('email').value,
+      user_type: "4", //4 es guarda
+      status: "1",
+      date_entry: Date.now(),
+      community_id: cookies.community_id
     };
-
-
-    const [listaGuardas, setListaGuardas] = useState([]);
-    const [urlFetch, setUrlFetch] = useState('http://localhost:4000/user/findGuards/');
-    const [guarda, setGuarda] = useState(emptyGuarda);
-    const [selectedGuardas, setSelectedGuardas] = useState(null);
-    const [globalFilter, setGlobalFilter] = useState(null);
-    const [deleteGuardaDialog, setDeleteGuardaDialog] = useState(false);
-    const [deleteGuardasDialog, setDeleteGuardasDialog] = useState(false);
-    const toast = useRef(null);
-    const dt = useRef(null);
-
-    const [cookies, setCookie] = useCookies();
-    const [changeStatusGuardDialog, setChangeStatusGuardDialog] = useState(false);
-
-    const [guardDialog, setGuardDialog] = useState(false);
-    const [submitted, setSubmitted] = useState(false);
-
-
-    async function listaGuardasF() {
-        let nombres = await fetch((urlFetch + cookies.community_id), { method: 'GET' });
-        let listaGuardasRes = await nombres.json();
-        let data = await listaGuardasRes.message.filter(
-            (val) => val.status != -1,
-        )
-        await data.map((item) => {
-            if (item.status == '1') {
-                item.status_text = 'Activo';
-            } else if (item.status == '0') {
-                item.status_text = 'Inactivo';
-            }
-        })
-        setListaGuardas(await data);
-    }
-
-    useEffect(() => {
+    if (guarda._id === null) {
+      console.log('ssss');
+      fetch('http://localhost:4000/user/createGuard', {
+        cache: 'no-cache',
+        method: 'POST',
+        mode: 'cors',
+        body: JSON.stringify(data),
+        headers: {
+          'Content-Type': 'application/json'
+        }
+      }).then((response) => {
+        if (response.status != 201)
+          console.log(`Ocurrió un error con el servicio: ${response.status}`);
+        else
+          return response.json();
+      }).then(() => {
         listaGuardasF();
-    }, [])
+      }).catch(
+        err => console.log('Ocurrió un error con el fetch', err)
+      );
+    } else {
+      data._id = guarda._id;
+      console.log(`Actualizando guarda: ${data}`);
+      fetch(`http://localhost:4000/user/updateGuard/${guarda._id}`, {
+        cache: 'no-cache',
+        method: 'PUT',
+        body: JSON.stringify(data),
+        headers: {
+          'Content-Type': 'application/json',
+        },
+      }).then((response) => {
+        if (response.status !== 200)
+          console.log(`Ocurrió un error con el servicio: ${response.status}`);
+        else return response.json();
+      }).then(() => {
+        toast.current.show({
+          severity: 'success',
+          summary: 'Guarda actualizada',
+          detail: 'Guarda actualizado correctamente'
+        });
+        setGuarda(emptyGuarda);
+        listaGuardasF();
+      })
+    }
+    setSaveButtonTitle("Registrar");
+  }
 
-    function registrarGuarda() {
-        var data = {
-            dni: document.getElementById('identificacion').value,
-            name: document.getElementById('nombre').value,
-            last_name: document.getElementById('apellidos').value,
-            email: document.getElementById('correo_electronico').value,
-            phone: document.getElementById('telefono').value,
-            password: document.getElementById('correo_electronico').value,
-            user_type: "4", //4 es guarda
-            status: "1",
-            community_id: cookies.community_id
-        };
-        var data2 = {
-            dni: "11979037",
-            name: "Jorge",
-            last_name: "Soto",
-            email: "jorgesoto@gmail.com",
-            phone: 84664515,
-            password: "1203",
-            user_type: "2",
-            status: "1",
-            community_id: "62be68215692582bbfd77134"
+  const cambiarStatusUser = () => {
+    if (guarda.status == '1') {
+      guarda.status = '0';
+      guarda.status_text = 'Inactivo';
+
+    } else if (guarda.status == '0') {
+      guarda.status = '1';
+      guarda.status_text = 'Activo';
+    }
+    var data = {
+      id: guarda._id,
+      status: guarda.status,
+    };
+    fetch('http://localhost:4000/user/changeStatus', {
+      cache: 'no-cache',
+      method: 'POST',
+      body: JSON.stringify(data),
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    }).then((response) => {
+      if (response.status != 201)
+        console.log(`Ocurrió un error con el servicio: ${response.status}`);
+      else
+        return response.json();
+    }).then(() => {
+      setChangeStatusGuardDialog(false);
+      toast.current.show({
+        severity: 'success',
+        summary: 'Éxito',
+        detail: 'Guarda de Seguridad Actualizado',
+        life: 3000,
+      });
+    }).catch(
+      err => console.log('Ocurrió un error con el fetch', err)
+    );
+  }
+
+
+  const deleteGuarda = () => {
+    fetch(`http://localhost:4000/user/deleteAdminSystem/${guarda._id}`, {
+      cache: 'no-cache',
+      method: 'DELETE',
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    }).then((response) => {
+      if (response.status != 201)
+        console.log(`Ocurrió un error con el servicio: ${response.status}`);
+      else
+        return response.json();
+    }).then(function() {
+      let _guarda = listaGuardas.filter(val => val._id !== guarda._id);
+      setListaGuardas(_guarda);
+      setDeleteGuardaDialog(false);
+      setGuarda(emptyGuarda);
+      toast.current.show({ severity: 'success', summary: 'Éxito', detail: 'Administrador del Sistema Eliminado', life: 3000 });
+    }).catch(err => {
+      console.log('Ocurrió un error con el fetch', err)
+      toast.current.show({ severity: 'danger', summary: 'Error', detail: 'Administrador del Sistema no se pudo Eliminar', life: 3000 });
+    });
+  }
+
+  const deleteSelectedGuardas = () => {
+    let _guardas = listaGuardas.filter(val => !selectedGuardas.includes(val));
+    selectedGuardas.map((item) => {
+      fetch('http://localhost:4000/user/deleteAdminSystem/' + item._id, {
+        cache: 'no-cache',
+        method: 'DELETE',
+        headers: {
+          'Content-Type': 'application/json'
         }
-        console.log('ssss');
-        fetch('http://localhost:4000/user/createGuard', {
-            cache: 'no-cache',
-            method: 'POST',
-            mode: 'cors',
-            body: JSON.stringify(data),
-            headers: {
-                'Content-Type': 'application/json'
-            }
-        })
-            .then(
-                function (response) {
-                    if (response.status != 201)
-                        console.log('Ocurrió un error con el servicio: ' + response.status);
-                    else
-                        return response.json();
-                }
-            )
-            .then(
-                function (response) {
-                    listaGuardasF();
-                }
-            )
-            .catch(
-                err => console.log('Ocurrió un error con el fetch', err)
-            );
+      })
+    })
+    setListaGuardas(_guardas);
+    setDeleteGuardasDialog(false);
+    setSelectedGuardas(null);
+    toast.current.show({
+      severity: 'success',
+      summary: 'Éxito',
+      detail: 'Administradores del Sistema Eliminados',
+      life: 3000
+    });
+  }
+
+  const hideDeleteGuardaDialog = () => {
+    setDeleteGuardaDialog(false);
+  }
+
+  const hideDeleteGuardasDialog = () => {
+    setDeleteGuardasDialog(false);
+  }
+
+  const confirmDeleteGuarda = (guarda) => {
+    setGuarda(guarda);
+    setDeleteGuardaDialog(true);
+  }
+
+  const confirmDeleteSelected = () => {
+    setDeleteGuardasDialog(true);
+  }
+
+  const hideChangeStatusGuardDialog = () => {
+    setChangeStatusGuardDialog(false);
+  };
+
+  const confirmChangeStatusGuard = (guard) => {
+    setGuarda(guard);
+    setChangeStatusGuardDialog(true);
+  };
+
+  const hideGuardDialog = () => {
+    setSubmitted(false);
+    setGuardDialog(false);
+  };
+
+  const infoGuard = (guard) => {
+    setGuarda(guard);
+    setGuardDialog(true);
+  };
+
+  const editGuard = (guard) => {
+    setGuarda(guard);
+    console.log(guard);
+    setSaveButtonTitle("Actualizar");
+  }
+
+  const cancelEdit = () => {
+    setGuarda(emptyGuarda);
+    setSaveButtonTitle("Registrar");
+  }
+
+  const actionsGuard = (rowData) => {
+    let icono = '';
+    let text = '';
+    if (rowData.status == '0') {
+      icono = "pi pi-eye";
+      text = "Activar Guarda de Seguridad"
+    } else if (rowData.status == '1') {
+      icono = "pi pi-eye-slash";
+      text = "Inactivar Guarda de Seguridad"
     }
-
-    const cambiarStatusUser = () => {
-        if (guarda.status == '1') {
-            guarda.status = '0';
-            guarda.status_text = 'Inactivo';
-
-        } else if (guarda.status == '0') {
-            guarda.status = '1';
-            guarda.status_text = 'Activo';
-        }
-        var data = {
-            id: guarda._id,
-            status: guarda.status,
-        };
-        fetch('http://localhost:4000/user/changeStatus', {
-            cache: 'no-cache',
-            method: 'POST',
-            body: JSON.stringify(data),
-            headers: {
-                'Content-Type': 'application/json'
-            }
-        })
-            .then(
-                function (response) {
-                    if (response.status != 201)
-                        console.log('Ocurrió un error con el servicio: ' + response.status);
-                    else
-                        return response.json();
-                }
-            )
-            .then(
-                function (response) {
-                    setChangeStatusGuardDialog(false);
-                    toast.current.show({
-                        severity: 'success',
-                        summary: 'Éxito',
-                        detail: 'Guarda de Seguridad Actualizado',
-                        life: 3000,
-                    });
-                }
-            )
-            .catch(
-                err => console.log('Ocurrió un error con el fetch', err)
-            );
-    }
-
-
-    const deleteGuarda = () => {
-
-        fetch('http://localhost:4000/user/deleteAdminSystem/' + guarda._id, {
-            cache: 'no-cache',
-            method: 'DELETE',
-            headers: {
-                'Content-Type': 'application/json'
-            }
-        })
-            .then(
-                function (response) {
-                    if (response.status != 201)
-                        console.log('Ocurrió un error con el servicio: ' + response.status);
-                    else
-                        return response.json();
-                }
-            )
-            .then(
-                function (response) {
-                    let _guarda = listaGuardas.filter(val => val._id !== guarda._id);
-                    setListaGuardas(_guarda);
-                    setDeleteGuardaDialog(false);
-                    setGuarda(emptyGuarda);
-                    toast.current.show({ severity: 'success', summary: 'Éxito', detail: 'Administrador del Sistema Eliminado', life: 3000 });
-                }
-            )
-            .catch(
-                err => {
-                    console.log('Ocurrió un error con el fetch', err)
-                    toast.current.show({ severity: 'danger', summary: 'Error', detail: 'Administrador del Sistema no se pudo Eliminar', life: 3000 });
-                }
-            );
-    }
-
-    const deleteSelectedGuardas = () => {
-        let _guardas = listaGuardas.filter(val => !selectedGuardas.includes(val));
-        selectedGuardas.map((item) => {
-            fetch('http://localhost:4000/user/deleteAdminSystem/' + item._id, {
-                cache: 'no-cache',
-                method: 'DELETE',
-                headers: {
-                    'Content-Type': 'application/json'
-                }
-            })
-        })
-        setListaGuardas(_guardas);
-        setDeleteGuardasDialog(false);
-        setSelectedGuardas(null);
-        toast.current.show({ severity: 'success', summary: 'Éxito', detail: 'Administradores del Sistema Eliminados', life: 3000 });
-    }
-
-    const hideDeleteGuardaDialog = () => {
-        setDeleteGuardaDialog(false);
-    }
-
-    const hideDeleteGuardasDialog = () => {
-        setDeleteGuardasDialog(false);
-    }
-
-    const confirmDeleteGuarda = (guarda) => {
-        setGuarda(guarda);
-        setDeleteGuardaDialog(true);
-    }
-
-    const confirmDeleteSelected = () => {
-        setDeleteGuardasDialog(true);
-    }
-
-    const hideChangeStatusGuardDialog = () => {
-        setChangeStatusGuardDialog(false);
-    };
-
-    const confirmChangeStatusGuard = (guard) => {
-        setGuarda(guard);
-        setChangeStatusGuardDialog(true);
-    };
-
-    const hideGuardDialog = () => {
-        setSubmitted(false);
-        setGuardDialog(false);
-    };
-
-    const infoGuard = (guard) => {
-        setGuarda(guard);
-        setGuardDialog(true);
-    };
-
-
-    const actionsGuard = (rowData) => {
-        let icono = '';
-        let text = '';
-        if (rowData.status == '0') {
-            icono = "pi pi-eye";
-            text = "Activar Guarda de Seguridad"
-        } else if (rowData.status == '1') {
-            icono = "pi pi-eye-slash";
-            text = "Inactivar Guarda de Seguridad"
-
-        }
-        return (
-            <div className="actions">
-                <Button
-                    icon="pi pi-exclamation-circle"
-                    className="p-button-rounded p-button-info mt-2 mx-2"
-                    onClick={() => infoGuard(rowData)}
-                />
-                <Button
-                    icon={`${icono}`}
-                    className="p-button-rounded p-button-warning mt-2 mx-2"
-                    onClick={() => confirmChangeStatusGuard(rowData)}
-                    title={`${text}`}
-                />
-                <Button icon="pi pi-trash"
-                    className="p-button-rounded p-button-danger mt-2 mx-2"
-                    onClick={() => confirmDeleteGuarda(rowData)} />
-            </div>
-        );
-    }
-
-    const leftToolbarTemplate = () => {
-        return (
-            <React.Fragment>
-                <div className="my-2">
-                    <Button label="Eliminar"
-                        icon="pi pi-trash"
-                        className="p-button-danger"
-                        onClick={confirmDeleteSelected}
-                        disabled={!selectedGuardas || !selectedGuardas.length} />
-                </div>
-            </React.Fragment>
-        )
-    }
-
-    const rightToolbarTemplate = () => {
-        return (
-            <React.Fragment>
-                <Button label="Exportar"
-                    icon="pi pi-upload"
-                    className="p-button-help" />
-            </React.Fragment>
-        )
-    }
-
-    const header = (
-        <div className="flex flex-column md:flex-row md:justify-content-between md:align-items-center">
-            <h5 className="m-0">Guardas de seguridad</h5>
-            <span className="block mt-2 md:mt-0 p-input-icon-left">
-                <i className="pi pi-search" />
-                <InputText type="search" onInput={(e) => setGlobalFilter(e.target.value)} placeholder="Buscar..." />
-            </span>
-        </div>
-    );
-
-    const deleteAdminSystemDialogFooter = (
-        <>
-            <Button label="No" icon="pi pi-times" className="p-button-text" onClick={hideDeleteGuardasDialog} />
-            <Button label="Sí" icon="pi pi-check" className="p-button-text" onClick={deleteGuarda} />
-        </>
-    );
-
-    const deleteAdminsSystemDialogFooter = (
-        <>
-            <Button label="No" icon="pi pi-times" className="p-button-text" onClick={hideDeleteGuardasDialog} />
-            <Button label="Sí" icon="pi pi-check" className="p-button-text" onClick={deleteSelectedGuardas} />
-        </>
-    );
-
-    const changeStatusGuardDialogFooter = (
-        <>
-            <Button
-                label="No"
-                icon="pi pi-times"
-                className="p-button-text"
-                onClick={hideChangeStatusGuardDialog}
-            />
-            <Button
-                label="Sí"
-                icon="pi pi-check"
-                className="p-button-text"
-                onClick={cambiarStatusUser}
-            />
-        </>
-    );
-
-    const guardDialogFooter = (
-        <>
-            <Button
-                label="Cerrar"
-                icon="pi pi-times"
-                className="p-button-text"
-                onClick={hideGuardDialog}
-            />
-
-        </>
-    );
-
-
-    const headerName = (
-        <>
-            <p>{' '}
-                <FontAwesomeIcon icon={faUserAlt} style={{ color: "#C08135" }} /> {' '}
-                Nombre
-            </p>
-        </>
-    )
-
-    const headerLastName = (
-        <>
-            <p>
-                {' '}
-                <FontAwesomeIcon icon={faUserAlt} style={{ color: "#D7A86E" }} />{' '}
-                Apellido(s)
-            </p>
-        </>
-    )
-
-    const headerDNI = (
-        <p> {' '}
-            <FontAwesomeIcon icon={faIdCardAlt} style={{ color: "#C08135" }} />{' '}
-            Identificación
-        </p>
-    )
-
-    const headerEmail = (
-        <>
-            <p> {' '}
-                <FontAwesomeIcon icon={faAt} style={{ color: "#D7A86E" }} />{' '}
-                Correo Electrónico
-            </p>
-        </>
-    )
-
-    const headerPhone = (
-        <>
-            <p>
-                {' '}
-                <FontAwesomeIcon icon={faPhoneAlt} style={{ color: '#C08135' }} />{' '}
-                Teléfono
-            </p>
-        </>
-    )
-
-    const headerStatus = (
-        <>
-            <p> {' '}
-                <FontAwesomeIcon icon={faCircleQuestion} style={{ color: "#D7A86E" }} />{' '}
-                Estado
-            </p>
-        </>
-    )
-
-    const statusBodyTemplate = (rowData) => {
-        return (
-            <>
-                <span
-                    className={`status status-${rowData.status}`}
-                >
-                    {rowData.status_text}
-                </span>
-            </>
-        );
-    };
-
     return (
-        <div className="grid">
-            <div className="col-12">
-                <Toast ref={toast} />
-                <div className="card">
-                    <Toolbar className="mb-4" left={leftToolbarTemplate} right={rightToolbarTemplate}></Toolbar>
-                    <DataTable ref={dt} value={listaGuardas} dataKey="_id" paginator rows={5} selection={selectedGuardas} onSelectionChange={(e) => setSelectedGuardas(e.value)}
-                        responsiveLayout="scroll" header={header}
-                        rowsPerPageOptions={[5, 10, 25]} className="datatable-responsive mt-3"
-                        paginatorTemplate="FirstPageLink PrevPageLink PageLinks NextPageLink LastPageLink CurrentPageReport RowsPerPageDropdown"
-                        currentPageReportTemplate="Mostrando {first} a {last} de {totalRecords}"
-                        globalFilter={globalFilter} emptyMessage="No hay guardas registrados.">
-                        <Column selectionMode="multiple" headerStyle={{ width: '3rem' }}></Column>
-                        <Column field="name" sortable header={headerName} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
-                        <Column field="last_name" sortable header={headerLastName} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }} alignFrozen="left"></Column>
-                        <Column field="dni" sortable header={headerDNI} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}>
-                        </Column>
-                        <Column field="email" sortable header={headerEmail} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
-                        <Column field="phone" header={headerPhone} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
-                        <Column
-                            field="status"
-                            sortable
-                            header={headerStatus}
-                            body={statusBodyTemplate}
-                            style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}>
-                        </Column>
-                        <Column style={{ flexGrow: 1, flexBasis: '80px', minWidth: '80px' }} body={actionsGuard}></Column>
-                    </DataTable>
-                    <Dialog
-                        visible={guardDialog}
-                        style={{ width: '650px' }}
-                        header="Información del Guarda de Seguridad"
-                        modal
-                        className="p-fluid"
-                        footer={guardDialogFooter}
-                        onHide={hideGuardDialog}>
-                        <div className='container text-center'>
-                            <div className='row my-4'>
-                                <div className=" col-4 md:col-4">
-                                    <p>Nombre</p>
-                                    <div className="p-0 col-2  md:col-2" style={{ margin: '0 auto' }}>
-                                        <div className="p-inputgroup align-items-center justify-content-evenly">
-                                            <i className="pi pi-user icon-khaki"></i>
-                                            <p>{guarda.name}</p>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div className=" col-4 md:col-4">
-                                    <p>Apellido(s)</p>
-                                    <div className="p-0 col-6  md:col-6" style={{ margin: '0 auto' }}>
-                                        <div className="p-inputgroup align-items-center justify-content-evenly">
-                                            <i className="pi pi-user icon-khaki"></i>
-                                            <p>{guarda.last_name}</p>
-                                        </div>
-
-                                    </div>
-                                </div>
-                                <div className=" col-4 col-md-4 md:col-4">
-                                    <p>Identificación</p>
-                                    <div className="p-0 col-10 md:col-10" style={{ margin: '0 auto' }}>
-                                        <div className="p-inputgroup align-items-center justify-content-evenly">
-                                            <i className="pi pi-id-card icon-khaki"></i>
-                                            <p>{guarda.dni}</p>
-                                        </div>
-
-                                    </div>
-                                </div>
-                            </div>
-                            <div className='row my-5 justify-content-center'>
-                                
-
-
-                            </div>
-                            <div className='row my-5 justify-content-center'>
-                                <div className=" col-4 md:col-4">
-                                    <p>Teléfono</p>
-                                    <div className="p-0 col-10 md:col-10">
-                                        <div className="p-inputgroup align-items-center justify-content-evenly">
-                                            <i className="pi pi-phone icon-khaki"></i>
-                                            <p>{guarda.phone}</p>
-                                        </div>
-
-                                    </div>
-                                </div>
-                                <div className=" col-6 md:col-6">
-                                    <p>Correo Electrónico</p>
-                                    <div className="p-0 col-10  md:col-10" style={{ margin: '0 auto' }}>
-                                        <div className="p-inputgroup align-items-center justify-content-evenly">
-                                            <i className="pi pi-envelope icon-khaki"></i>
-                                            <p>{guarda.email}</p>
-                                        </div>
-
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                    </Dialog>
-                    <Dialog visible={deleteGuardaDialog} style={{ width: '450px' }} header="Confirmar" modal footer={deleteAdminSystemDialogFooter} onHide={hideDeleteGuardaDialog}>
-                        <div className="flex align-items-center justify-content-center">
-                            <i className="pi pi-exclamation-triangle mr-3" style={{ fontSize: '2rem' }} />
-                            {guarda && <span>¿Estás seguro que desea eliminar a <b>{guarda.name}</b>?</span>}
-                        </div>
-                    </Dialog>
-                    <Dialog visible={deleteGuardasDialog} style={{ width: '450px' }} header="Confirmar" modal footer={deleteAdminsSystemDialogFooter} onHide={hideDeleteGuardasDialog}>
-                        <div className="flex align-items-center justify-content-center">
-                            <i className="pi pi-exclamation-triangle mr-3" style={{ fontSize: '2rem' }} />
-                            {selectedGuardas && <span>¿Está seguro eliminar los guardas de seguridad seleccionados?</span>}
-                        </div>
-                    </Dialog>
-                    <Dialog
-                        visible={changeStatusGuardDialog}
-                        style={{ width: '450px' }}
-                        header="Confirmar"
-                        modal
-                        footer={changeStatusGuardDialogFooter}
-                        onHide={hideChangeStatusGuardDialog}
-                    >
-                        <div className="flex align-items-center justify-content-center">
-                            <i
-                                className="pi pi-exclamation-triangle mr-3"
-                                style={{ fontSize: '2rem' }}
-                            />
-                            {guarda && (
-                                <span>
-                                    ¿Estás seguro que desea cambiar estado a <b>{guarda.name}</b>?
-                                </span>
-                            )}
-                        </div>
-                    </Dialog>
-                </div>
-            </div>
-            <div className="col-12">
-                <div className="card">
-                    <h5>Registro de un guarda de seguridad</h5>
-                    <div className="p-fluid formgrid grid">
-                        <div className="field col-12 md:col-6">
-                            <label htmlFor="nombre">Nombre</label>
-                            <InputText id="nombre" type="text" />
-                        </div>
-                        <div className="field col-12 md:col-6">
-                            <label htmlFor="apellidos">Apellido(s)</label>
-                            <InputText id="apellidos" type="text" />
-                        </div>
-                        <div className="field col-12 md:col-6">
-                            <label htmlFor="correo_electronico">Correo electrónico</label>
-                            <InputText id="correo_electronico" type="email" />
-                        </div>
-                        <div className="field col-12 md:col-6">
-                            <label htmlFor="identificacion">Identificación</label>
-                            <InputText id="identificacion" type="text" />
-                        </div>
-                        <div className="field col-12">
-                            <label htmlFor="telefono">Teléfono</label>
-                            <InputText id="telefono" type="tel" rows="4" />
-                        </div>
-                        <Button label="Registrar" onClick={registrarGuarda}></Button>
-                    </div>
-                </div>
-            </div>
-        </div>
+      <div className="actions">
+        <Button
+          icon="pi pi-pencil"
+          className="p-button-rounded p-button-success mt-2 mx-2"
+          onClick={() => editGuard(rowData)}
+          title="Editar"
+        />
+        <Button
+          icon="pi pi-exclamation-circle"
+          className="p-button-rounded p-button-info mt-2 mx-2"
+          onClick={() => infoGuard(rowData)}
+        />
+        <Button
+          icon={`${icono}`}
+          className="p-button-rounded p-button-warning mt-2 mx-2"
+          onClick={() => confirmChangeStatusGuard(rowData)}
+          title={`${text}`}
+        />
+        <Button icon="pi pi-trash"
+          className="p-button-rounded p-button-danger mt-2 mx-2"
+          onClick={() => confirmDeleteGuarda(rowData)} />
+      </div>
     );
+  }
+
+  const leftToolbarTemplate = () => {
+    return (
+      <React.Fragment>
+        <div className="my-2">
+          <Button label="Eliminar"
+            icon="pi pi-trash"
+            className="p-button-danger"
+            onClick={confirmDeleteSelected}
+            disabled={!selectedGuardas || !selectedGuardas.length} />
+        </div>
+      </React.Fragment>
+    )
+  }
+
+  const rightToolbarTemplate = () => {
+    return (
+      <React.Fragment>
+        <Button label="Exportar"
+          icon="pi pi-upload"
+          className="p-button-help" />
+      </React.Fragment>
+    )
+  }
+
+  const header = (
+    <div className="flex flex-column md:flex-row md:justify-content-between md:align-items-center">
+      <h5 className="m-0">Guardas de seguridad</h5>
+      <span className="block mt-2 md:mt-0 p-input-icon-left">
+        <i className="pi pi-search" />
+        <InputText type="search" onInput={(e) => setGlobalFilter(e.target.value)} placeholder="Buscar..." />
+      </span>
+    </div>
+  );
+
+  const deleteAdminSystemDialogFooter = (
+    <>
+      <Button label="No" icon="pi pi-times" className="p-button-text" onClick={hideDeleteGuardasDialog} />
+      <Button label="Sí" icon="pi pi-check" className="p-button-text" onClick={deleteGuarda} />
+    </>
+  );
+
+  const deleteAdminsSystemDialogFooter = (
+    <>
+      <Button label="No" icon="pi pi-times" className="p-button-text" onClick={hideDeleteGuardasDialog} />
+      <Button label="Sí" icon="pi pi-check" className="p-button-text" onClick={deleteSelectedGuardas} />
+    </>
+  );
+
+  const changeStatusGuardDialogFooter = (
+    <>
+      <Button
+        label="No"
+        icon="pi pi-times"
+        className="p-button-text"
+        onClick={hideChangeStatusGuardDialog}
+      />
+      <Button
+        label="Sí"
+        icon="pi pi-check"
+        className="p-button-text"
+        onClick={cambiarStatusUser}
+      />
+    </>
+  );
+
+  const guardDialogFooter = (
+    <>
+      <Button
+        label="Cerrar"
+        icon="pi pi-times"
+        className="p-button-text"
+        onClick={hideGuardDialog}
+      />
+    </>
+  );
+
+
+  const headerName = (
+    <>
+      <p>{' '}
+        <FontAwesomeIcon icon={faUserAlt} style={{ color: "#C08135" }} /> {' '}
+        Nombre
+      </p>
+    </>
+  )
+
+  const headerLastName = (
+    <>
+      <p>
+        {' '}
+        <FontAwesomeIcon icon={faUserAlt} style={{ color: "#D7A86E" }} />{' '}
+        Apellido(s)
+      </p>
+    </>
+  )
+
+  const headerDNI = (
+    <p> {' '}
+      <FontAwesomeIcon icon={faIdCardAlt} style={{ color: "#C08135" }} />{' '}
+      Identificación
+    </p>
+  )
+
+  const headerEmail = (
+    <>
+      <p> {' '}
+        <FontAwesomeIcon icon={faAt} style={{ color: "#D7A86E" }} />{' '}
+        Correo Electrónico
+      </p>
+    </>
+  )
+
+  const headerPhone = (
+    <>
+      <p>
+        {' '}
+        <FontAwesomeIcon icon={faPhoneAlt} style={{ color: '#C08135' }} />{' '}
+        Teléfono
+      </p>
+    </>
+  )
+
+  const headerStatus = (
+    <>
+      <p> {' '}
+        <FontAwesomeIcon icon={faCircleQuestion} style={{ color: "#D7A86E" }} />{' '}
+        Estado
+      </p>
+    </>
+  )
+
+  const statusBodyTemplate = (rowData) => {
+    return (
+      <>
+        <span
+          className={`status status-${rowData.status}`}
+        >
+          {rowData.status_text}
+        </span>
+      </>
+    );
+  };
+
+  const onInputChange = (e, name) => {
+    const value = (e.target && e.target.value) || ''
+    let _guarda = { ...guarda }
+    _guarda[`${name}`] = value
+    setGuarda(_guarda)
+  }
+
+  return (
+    <div className="grid">
+      <div className="col-12">
+        <Toast ref={toast} />
+        <div className="card">
+          <Toolbar className="mb-4" left={leftToolbarTemplate} right={rightToolbarTemplate}></Toolbar>
+          <DataTable ref={dt} value={listaGuardas} dataKey="_id" paginator rows={5} selection={selectedGuardas} onSelectionChange={(e) => setSelectedGuardas(e.value)}
+            responsiveLayout="scroll" header={header}
+            rowsPerPageOptions={[5, 10, 25]} className="datatable-responsive mt-3"
+            paginatorTemplate="FirstPageLink PrevPageLink PageLinks NextPageLink LastPageLink CurrentPageReport RowsPerPageDropdown"
+            currentPageReportTemplate="Mostrando {first} a {last} de {totalRecords}"
+            globalFilter={globalFilter} emptyMessage="No hay guardas registrados.">
+            <Column selectionMode="multiple" headerStyle={{ width: '3rem' }}></Column>
+            <Column field="name" sortable header={headerName} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
+            <Column field="last_name" sortable header={headerLastName} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }} alignFrozen="left"></Column>
+            <Column field="dni" sortable header={headerDNI} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}>
+            </Column>
+            <Column field="email" sortable header={headerEmail} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
+            <Column field="phone" header={headerPhone} style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}></Column>
+            <Column
+              field="status"
+              sortable
+              header={headerStatus}
+              body={statusBodyTemplate}
+              style={{ flexGrow: 1, flexBasis: '160px', minWidth: '160px', wordBreak: 'break-word' }}>
+            </Column>
+            <Column style={{ flexGrow: 1, flexBasis: '80px', minWidth: '80px' }} body={actionsGuard}></Column>
+          </DataTable>
+          <Dialog
+            visible={guardDialog}
+            style={{ width: '650px' }}
+            header="Información del Guarda de Seguridad"
+            modal
+            className="p-fluid"
+            footer={guardDialogFooter}
+            onHide={hideGuardDialog}>
+            <div className='container text-center'>
+              <div className='row my-4'>
+                <div className=" col-4 md:col-4">
+                  <p>Nombre</p>
+                  <div className="p-0 col-2  md:col-2" style={{ margin: '0 auto' }}>
+                    <div className="p-inputgroup align-items-center justify-content-evenly">
+                      <i className="pi pi-user icon-khaki"></i>
+                      <p>{guarda.name}</p>
+                    </div>
+                  </div>
+                </div>
+                <div className=" col-4 md:col-4">
+                  <p>Apellido(s)</p>
+                  <div className="p-0 col-6  md:col-6" style={{ margin: '0 auto' }}>
+                    <div className="p-inputgroup align-items-center justify-content-evenly">
+                      <i className="pi pi-user icon-khaki"></i>
+                      <p>{guarda.last_name}</p>
+                    </div>
+
+                  </div>
+                </div>
+                <div className=" col-4 col-md-4 md:col-4">
+                  <p>Identificación</p>
+                  <div className="p-0 col-10 md:col-10" style={{ margin: '0 auto' }}>
+                    <div className="p-inputgroup align-items-center justify-content-evenly">
+                      <i className="pi pi-id-card icon-khaki"></i>
+                      <p>{guarda.dni}</p>
+                    </div>
+
+                  </div>
+                </div>
+              </div>
+              <div className='row my-5 justify-content-center'>
+              </div>
+              <div className='row my-5 justify-content-center'>
+                <div className=" col-4 md:col-4">
+                  <p>Teléfono</p>
+                  <div className="p-0 col-10 md:col-10">
+                    <div className="p-inputgroup align-items-center justify-content-evenly">
+                      <i className="pi pi-phone icon-khaki"></i>
+                      <p>{guarda.phone}</p>
+                    </div>
+
+                  </div>
+                </div>
+                <div className=" col-6 md:col-6">
+                  <p>Correo Electrónico</p>
+                  <div className="p-0 col-10  md:col-10" style={{ margin: '0 auto' }}>
+                    <div className="p-inputgroup align-items-center justify-content-evenly">
+                      <i className="pi pi-envelope icon-khaki"></i>
+                      <p>{guarda.email}</p>
+                    </div>
+
+                  </div>
+                </div>
+              </div>
+            </div>
+
+          </Dialog>
+          <Dialog visible={deleteGuardaDialog} style={{ width: '450px' }} header="Confirmar" modal footer={deleteAdminSystemDialogFooter} onHide={hideDeleteGuardaDialog}>
+            <div className="flex align-items-center justify-content-center">
+              <i className="pi pi-exclamation-triangle mr-3" style={{ fontSize: '2rem' }} />
+              {guarda && <span>¿Estás seguro que desea eliminar a <b>{guarda.name}</b>?</span>}
+            </div>
+          </Dialog>
+          <Dialog visible={deleteGuardasDialog} style={{ width: '450px' }} header="Confirmar" modal footer={deleteAdminsSystemDialogFooter} onHide={hideDeleteGuardasDialog}>
+            <div className="flex align-items-center justify-content-center">
+              <i className="pi pi-exclamation-triangle mr-3" style={{ fontSize: '2rem' }} />
+              {selectedGuardas && <span>¿Está seguro eliminar los guardas de seguridad seleccionados?</span>}
+            </div>
+          </Dialog>
+          <Dialog
+            visible={changeStatusGuardDialog}
+            style={{ width: '450px' }}
+            header="Confirmar"
+            modal
+            footer={changeStatusGuardDialogFooter}
+            onHide={hideChangeStatusGuardDialog}
+          >
+            <div className="flex align-items-center justify-content-center">
+              <i
+                className="pi pi-exclamation-triangle mr-3"
+                style={{ fontSize: '2rem' }}
+              />
+              {guarda && (
+                <span>
+                  ¿Estás seguro que desea cambiar estado a <b>{guarda.name}</b>?
+                </span>
+              )}
+            </div>
+          </Dialog>
+        </div>
+      </div>
+      <div className="col-12">
+        <div className="card">
+          <h5>Registro de un Guarda de Seguridad</h5>
+          <div className="p-fluid formgrid grid">
+            <div className="field col-12 md:col-6">
+              <label htmlFor="name">Nombre</label>
+              <div className="p-0 col-12 md:col-12">
+                <div className="p-inputgroup">
+                  <span className="p-inputgroup-addon p-button p-icon-input-khaki">
+                    <i className="pi pi-home"></i>
+                  </span>
+                  <InputText type="text" id="name" value={guarda.name} onChange={(e) => onInputChange(e, 'name')} required autoFocus className={classNames({ 'p-invalid': submitted && guarda.name === '' })} />
+                </div>
+                {submitted && guarda.name === '' && <small className="p-invalid">Nombre es requerido.</small>}
+              </div>
+            </div>
+            <div className="field col-12 md:col-6">
+              <label htmlFor="name">Apellido(s)</label>
+              <div className="p-0 col-12 md:col-12">
+                <div className="p-inputgroup">
+                  <span className="p-inputgroup-addon p-button p-icon-input-khaki">
+                    <i className="pi pi-home"></i>
+                  </span>
+                  <InputText type="text" id="last_name" value={guarda.last_name} onChange={(e) => onInputChange(e, 'last_name')} required autoFocus className={classNames({ 'p-invalid': submitted && guarda.last_name === '' })} />
+                </div>
+                {submitted && guarda.last_name === '' && <small className="p-invalid">Apellidos son requeridos.</small>}
+              </div>
+            </div>
+            <div className="field col-12 md:col-6">
+              <label htmlFor="name">Correo Electrónico</label>
+              <div className="p-0 col-12 md:col-12">
+                <div className="p-inputgroup">
+                  <span className="p-inputgroup-addon p-button p-icon-input-khaki">
+                    <i className="pi pi-home"></i>
+                  </span>
+                  <InputText type='email' id="email" value={guarda.email} onChange={(e) => onInputChange(e, 'email')} required autoFocus className={classNames({ 'p-invalid': submitted && guarda.email === '' })} />
+                </div>
+                {submitted && guarda.email === '' && <small className="p-invalid">Correo electrónico es requerido.</small>}
+              </div>
+            </div>
+            <div className="field col-12 md:col-6">
+              <label htmlFor="dni">Identificación</label>
+              <div className="p-0 col-12 md:col-12">
+                <div className="p-inputgroup">
+                  <span className="p-inputgroup-addon p-button p-icon-input-khaki">
+                    <i className="pi pi-home"></i>
+                  </span>
+                  <InputText id="dni" value={guarda.dni} onChange={(e) => onInputChange(e, 'dni')} required autoFocus className={classNames({ 'p-invalid': submitted && guarda.dni === '' })} />
+                </div>
+                {submitted && guarda.email === '' && <small className="p-invalid">Identificación es requerida.</small>}
+              </div>
+            </div>
+            <div className="field col-12 md:col-6">
+              <label htmlFor="phone">Número de teléfono</label>
+              <div className="p-0 col-12 md:col-12">
+                <div className="p-inputgroup">
+                  <span className="p-inputgroup-addon p-button p-icon-input-khaki">
+                    <i className="pi pi-phone"></i>
+                  </span>
+                  <InputText id="phone" value={guarda.phone} onChange={(e) => onInputChange(e, 'phone')} type='tel' required autoFocus className={classNames({ 'p-invalid': submitted && guarda.phone === '' })} />
+                </div>
+                {submitted
+                  && guarda.phone === ''
+                  && <small className="p-invalid">Número de teléfono es requerido.</small>}
+              </div>
+            </div>
+            <div style={{
+              display: "flex",
+              justifyContent: "center",
+              gap: "10px",
+              width: "100%"
+            }}>
+              <Button
+                label={`${saveButtonTitle}`}
+                onClick={registrarGuarda}
+              />
+              {saveButtonTitle === 'Actualizar' && (
+                <Button
+                  label="Cancel"
+                  onClick={cancelEdit}
+                  className="p-button-danger" />)}
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
 };
 
 export default React.memo(GuardasSeguridad);
diff --git a/web-ui/web-react/src/components/Inquilinos.js b/web-ui/web-react/src/components/Inquilinos.js
index a73f6b3d..244196da 100644
--- a/web-ui/web-react/src/components/Inquilinos.js
+++ b/web-ui/web-react/src/components/Inquilinos.js
@@ -47,7 +47,6 @@ const Inquilinos = () => {
   const [housesList, setHousesList] = useState([])
   const [submitted, setSubmitted] = useState(false)
   const [infoDialogVisible, setShowInfoDialog] = useState(false)
-  const [cancelSaveButtonVisible, setCancelSaveButtonVisible] = useState(false)
   const toast = useRef(null)
   const dt = useRef(null)
   const [cookies] = useCookies()
@@ -279,7 +278,6 @@ const Inquilinos = () => {
   const cancelEdit = () => {
     setTenant(emptyTenant);
     setSaveButtonTitle('Registrar');
-    setCancelSaveButtonVisible(false);
     setHouseNumber('');
   }
 
@@ -761,7 +759,7 @@ const Inquilinos = () => {
       </div>
       <div className="col-12">
         <div className="card">
-          <h5>Registro de un administrador de una comunidad de viviendas</h5>
+          <h5>Registro de un Inquilino</h5>
           <div className="p-fluid formgrid grid">
             <div className="field col-12 md:col-6">
               <label htmlFor="name">Nombre</label>