diff --git a/app/(private)/ActivosMantenimiento/page.tsx b/app/(private)/ActivosMantenimiento/page.tsx
index 9657fd0..2f0136d 100644
--- a/app/(private)/ActivosMantenimiento/page.tsx
+++ b/app/(private)/ActivosMantenimiento/page.tsx
@@ -45,7 +45,7 @@ export default async function Page(props: {
             label: "Equipos",
             content: (
               <>
-                <SearchUser urlBase="ActivosMantenimiento" value={numAcount} />
+                <SearchUser value={numAcount} />
                 <Equipos />
               </>
             ),
diff --git a/app/(private)/AgregarTiempo/page.tsx b/app/(private)/AgregarTiempo/page.tsx
index bbf12da..723498d 100644
--- a/app/(private)/AgregarTiempo/page.tsx
+++ b/app/(private)/AgregarTiempo/page.tsx
@@ -49,7 +49,7 @@ export default async function Page(props: {
 
       <h2 className="title"> AGREGAR TIEMPO </h2>
 
-      <SearchUser urlBase="AgregarTiempo" value={numAcount} />
+      <SearchUser value={numAcount} />
 
       {student ? (
         <>
diff --git a/app/(private)/AsignacionEquipo/page.tsx b/app/(private)/AsignacionEquipo/page.tsx
index 5c5437e..7e4976d 100644
--- a/app/(private)/AsignacionEquipo/page.tsx
+++ b/app/(private)/AsignacionEquipo/page.tsx
@@ -2,11 +2,14 @@ import AlertBox from "@/app/Components/Global/AlertBox/AlertBox";
 import ClearParams from "@/app/Components/Global/ClearParams/ClearParams";
 import SearchUser from "@/app/Components/Global/SearchUser/searchUser";
 import Toggle from "@/app/Components/Global/Toggle/Toggle";
+import { GetStudent } from "@/app/lib/getStudent";
+
+import '@/app/globals.css'
 
 export default async function Page(props: {
   searchParams?: Promise<{
     numAcount?: string;
-    machine?:string;
+    machine?: string;
     success?: string;
     error?: string;
   }>;
@@ -17,6 +20,17 @@ export default async function Page(props: {
   const showSuccess = params?.success ? params.success : null;
   const showError = params?.error ? params.error : null;
 
+  let student: any = null;
+
+  if (numAcount) {
+    const result = await GetStudent(parseInt(numAcount));
+
+    if (result.error) {
+    } else {
+      student = result;
+    }
+  }
+
   return (
     <section className="containerSection">
       {showError && (
@@ -32,7 +46,7 @@ export default async function Page(props: {
           <ClearParams paramsToClear={["success"]} />
         </>
       )}
-      
+
       <h2 className="title"> ASIGNACION DE EQUIPOS </h2>
 
       <Toggle
@@ -43,9 +57,9 @@ export default async function Page(props: {
             label: "Asignar tiempo",
             content: (
               <>
-                <SearchUser urlBase="AsignacionEquipo" value={numAcount} />
+                <SearchUser value={numAcount} />
 
-                <form className="containerForm"></form>
+                {student && <h1>No hay records disponibles</h1>}
               </>
             ),
           },
@@ -63,7 +77,7 @@ export default async function Page(props: {
                   </label>
                 </div>
 
-                <SearchUser urlBase="AsignacionEquipo" value={numAcount} />
+                <SearchUser value={numAcount} />
               </>
             ),
           },
diff --git a/app/(private)/AsignacionMesas/page.tsx b/app/(private)/AsignacionMesas/page.tsx
index 6b67fd1..4396bbb 100644
--- a/app/(private)/AsignacionMesas/page.tsx
+++ b/app/(private)/AsignacionMesas/page.tsx
@@ -18,7 +18,7 @@ export default function Page() {
             label: "Asignar mesa",
             content: (
               <>
-                <SearchUser urlBase="AsignacionMesas" value={"3"} />
+                <SearchUser value={"3"} />
 
                 <form className="containerForm">
                   <label className="label">Mesas disponibles</label>
@@ -56,7 +56,7 @@ export default function Page() {
                     <input type="checkbox" /> Cuenta
                   </label>
                 </div>
-                <SearchUser urlBase="AsignacionMesas" value={"3"} />
+                <SearchUser value={"3"} />
               </>
             ),
           },
diff --git a/app/(private)/Impresiones/page.tsx b/app/(private)/Impresiones/page.tsx
index f02e6d2..f78b77e 100644
--- a/app/(private)/Impresiones/page.tsx
+++ b/app/(private)/Impresiones/page.tsx
@@ -51,7 +51,7 @@ export default async function Page(props: {
       )}
 
       <h2 className="title">IMPRESIONES Y PLOTEO</h2>
-      <SearchUser urlBase="Impresiones" value={numAcount} />
+      <SearchUser value={numAcount} />
 
       {student && (
         <>
diff --git a/app/(private)/InformacionEquipo/informacionequipo.css b/app/(private)/InformacionEquipo/informacionequipo.css
index 3edf365..151831f 100644
--- a/app/(private)/InformacionEquipo/informacionequipo.css
+++ b/app/(private)/InformacionEquipo/informacionequipo.css
@@ -44,7 +44,6 @@
   display: grid;
   grid-template-columns: repeat(3, 240px); /* ancho fijo por columna */
   gap: 6px 20px;
-  margin-bottom: 20px;
   flex-wrap: wrap;
   margin-right: 2px;
 }
diff --git a/app/(private)/InformacionEquipo/page.tsx b/app/(private)/InformacionEquipo/page.tsx
index f0d7e2b..e664473 100644
--- a/app/(private)/InformacionEquipo/page.tsx
+++ b/app/(private)/InformacionEquipo/page.tsx
@@ -8,12 +8,14 @@ import ClearParams from "@/app/Components/Global/ClearParams/ClearParams";
 
 export default async function Page(props: {
   searchParams?: Promise<{
-    machine: string;
+    key?:string;
+    machine?: string;
     success?: string;
     error?: string;
   }>;
 }) {
   const params = await props.searchParams;
+  const key = params?.key && params.key;
   const machine = params?.machine ? params.machine : null;
   const showSuccess = params?.success ? params.success : null;
   const showError = params?.error ? params.error : null;
@@ -37,15 +39,15 @@ export default async function Page(props: {
       <h2 className="title"> INFORMACION DE EQUIPOS </h2>
 
       <Toggle
-        defaultView="1"
+        defaultView={key}
         options={[
           {
-            key: "1",
+            key: "Equipos",
             label: "Equipos",
             content: <Equipos />,
           },
           {
-            key: "2",
+            key: "Equipo",
             label: "Programa por equipo",
             content: (
               <ProgramSelector
@@ -56,7 +58,7 @@ export default async function Page(props: {
             ),
           },
           {
-            key: "3",
+            key: "Sala",
             label: "Programa por sala",
             content: (
               <ProgramSelector
diff --git a/app/(private)/Inscripcion/page.tsx b/app/(private)/Inscripcion/page.tsx
index 0529080..b5fd570 100644
--- a/app/(private)/Inscripcion/page.tsx
+++ b/app/(private)/Inscripcion/page.tsx
@@ -49,7 +49,7 @@ export default async function Page(props: {
 
       <h2 className="title"> INSCRIPCION </h2>
 
-      <SearchUser urlBase="Inscripcion" value={numAcount} />
+      <SearchUser value={numAcount} />
 
       {student && (
         <>
diff --git a/app/(private)/QuitarSancion/page.tsx b/app/(private)/QuitarSancion/page.tsx
index d33b5de..74d7ef3 100644
--- a/app/(private)/QuitarSancion/page.tsx
+++ b/app/(private)/QuitarSancion/page.tsx
@@ -17,7 +17,7 @@ export default async function Page(props: {
     <>
     <h2 className="title"> Quitar Sanciones </h2>
     <div style={{ display: "flex", gap: "1rem", flexDirection: "column" }}>
-      <SearchUser urlBase="QuitarSancion" value={numAcount} />
+      <SearchUser value={numAcount} />
       <QuitarSancion />
     </div>
     </>
diff --git a/app/Components/ActivosMantenimiento/Mesas.tsx b/app/Components/ActivosMantenimiento/Mesas.tsx
index 42b2eef..cf4f3e7 100644
--- a/app/Components/ActivosMantenimiento/Mesas.tsx
+++ b/app/Components/ActivosMantenimiento/Mesas.tsx
@@ -22,9 +22,10 @@ function Mesas() {
           <option value="90">15</option>
         </select>
 
-        <div className="checkbox">
+        <div className="checkbox-grid">
+          <label>
           <input type="checkbox" />
-          <label>Mantenimiento</label>
+            Mantenimiento</label>
         </div>
 
         <button className="button buttonSearch" type="submit">
diff --git a/app/Components/BitacoraSanciones/Sanciones.tsx b/app/Components/BitacoraSanciones/Sanciones.tsx
index ac97716..477885f 100644
--- a/app/Components/BitacoraSanciones/Sanciones.tsx
+++ b/app/Components/BitacoraSanciones/Sanciones.tsx
@@ -12,7 +12,7 @@ export default async function Sanciones(props: { student?: Student }) {
 
   return (
     <>
-      <SearchUser urlBase="BitacoraSanciones" value={idCuenta} />
+      <SearchUser value={idCuenta} />
       {props.student && (
         <>
           <Information
diff --git a/app/Components/Global/ClearParams/ClearParams.tsx b/app/Components/Global/ClearParams/ClearParams.tsx
index fb9e4fb..7bf870c 100644
--- a/app/Components/Global/ClearParams/ClearParams.tsx
+++ b/app/Components/Global/ClearParams/ClearParams.tsx
@@ -8,6 +8,7 @@ interface ClearParamsProps {
 
 export default function ClearParams({ paramsToClear }: ClearParamsProps) {
   useEffect(() => {
+    if (typeof window === "undefined") return;
     const url = new URL(window.location.href);
     let changed = false;
 
diff --git a/app/Components/Global/SearchUser/searchUser.tsx b/app/Components/Global/SearchUser/searchUser.tsx
index a04d080..8057454 100644
--- a/app/Components/Global/SearchUser/searchUser.tsx
+++ b/app/Components/Global/SearchUser/searchUser.tsx
@@ -1,16 +1,17 @@
-'use client'
+"use client";
 
-import { useRouter } from "next/navigation";
+import { usePathname, useRouter, useSearchParams } from "next/navigation";
 import { useEffect, useState } from "react";
 
-interface urlProp{
-  urlBase:string
-  value:string|null
+interface urlProp {
+  value: string | null;
 }
 
-function SearchUser(props:urlProp) {
+function SearchUser(props: urlProp) {
   const [numAcount, setnumAcount] = useState("");
   const router = useRouter();
+  const pathname = usePathname();
+  const searchParams = useSearchParams();
 
   useEffect(() => {
     if (props.value) {
@@ -20,16 +21,17 @@ function SearchUser(props:urlProp) {
 
   const handleSubmit = (e: React.FormEvent) => {
     e.preventDefault();
-
+    const params = new URLSearchParams(searchParams.toString());
     if (numAcount) {
-      router.push(`/${props.urlBase}?numAcount=${numAcount}`);
+      params.delete("error");
+      params.set("numAcount", `${numAcount}`);
+      router.push(`${pathname}?${params.toString()}`);
     }
   };
 
   return (
     <>
-      <form className="containerForm"
-      onSubmit={handleSubmit}>
+      <form className="containerForm" onSubmit={handleSubmit}>
         <label className="label">No.Cuenta</label>
         <div className="groupInput">
           <input
diff --git a/app/Components/Global/Toggle/Toggle.tsx b/app/Components/Global/Toggle/Toggle.tsx
index 6fc4c0c..999bf9b 100644
--- a/app/Components/Global/Toggle/Toggle.tsx
+++ b/app/Components/Global/Toggle/Toggle.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useSearchParams } from "next/navigation";
+import { usePathname, useSearchParams } from "next/navigation";
 import { useRouter } from "next/navigation";
 import { useState, ReactNode } from "react";
 
@@ -18,6 +18,7 @@ interface ToggleProps {
 export default function Toggle({ options, defaultView }: ToggleProps) {
   const router = useRouter();
   const searchParams = useSearchParams();
+  const pathname = usePathname();
   const [view, setView] = useState(defaultView || options[0].key);
 
   const handleClick = (key: string) => {
@@ -26,7 +27,7 @@ export default function Toggle({ options, defaultView }: ToggleProps) {
     const params = new URLSearchParams(searchParams.toString());
     params.set("key", key);
 
-    router.replace(`${window.location.pathname}?${params.toString()}`);
+    router.replace(`${pathname}?${params.toString()}`);
   };
   
   return (
diff --git a/app/Components/Global/visual/GlobalAlert.tsx b/app/Components/Global/visual/GlobalAlert.tsx
index 0587640..a1518bf 100644
--- a/app/Components/Global/visual/GlobalAlert.tsx
+++ b/app/Components/Global/visual/GlobalAlert.tsx
@@ -3,15 +3,16 @@
 import { useEffect, useState } from "react";
 import AlertBox from "@/app/Components/Global/AlertBox/AlertBox";
 import ClearParams from "@/app/Components/Global/ClearParams/ClearParams";
+import { useSearchParams } from "next/navigation";
 
 export default function GlobalAlert() {
+  const searchParams = useSearchParams();
   const [showSuccess, setShowSuccess] = useState<string | null>(null);
   const [showError, setShowError] = useState<string | null>(null);
 
   useEffect(() => {
-    const url = new URL(window.location.href);
-    const success = url.searchParams.get("success");
-    const error = url.searchParams.get("error");
+    const success = searchParams.get("success");
+    const error = searchParams.get("error");
 
     if (success) setShowSuccess(success);
     if (error) setShowError(error);
diff --git a/app/Components/Impressions/impressions.tsx b/app/Components/Impressions/impressions.tsx
index 018a35d..0f1a2cf 100644
--- a/app/Components/Impressions/impressions.tsx
+++ b/app/Components/Impressions/impressions.tsx
@@ -2,7 +2,7 @@
 
 import Cookies from "js-cookie";
 import { useState } from "react";
-import { useRouter } from "next/navigation";
+import { usePathname, useRouter, useSearchParams } from "next/navigation";
 import { PostImpressions } from "@/app/lib/postImpressions";
 
 interface CostOption {
@@ -19,6 +19,8 @@ function Impressions({ costs, numAcount }: ImpressionsProps) {
   const [cost, setCost] = useState("");
 
   const router = useRouter();
+  const pathname = usePathname();
+  const searchParams = useSearchParams();
 
   const handleLogout = () => {
     Cookies.remove("token");
@@ -27,12 +29,11 @@ function Impressions({ costs, numAcount }: ImpressionsProps) {
   };
 
   const handlePayment = async () => {
-    const currentUrl = new URL(window.location.href);
-    const params = new URLSearchParams();
+    const params = new URLSearchParams(searchParams.toString());
 
     const setError = (msg: string) => {
       params.set("error", msg);
-      router.push(`${currentUrl}&${params.toString()}`);
+      router.push(`${pathname}&${params.toString()}`);
     };
 
     if (!numAcount) {
@@ -65,7 +66,7 @@ function Impressions({ costs, numAcount }: ImpressionsProps) {
     setCost("");
     params.delete("error");
     params.set("success", "Impresion cobrada correctamente");
-    router.push(`${currentUrl}&${params.toString()}`);
+    router.push(`${pathname}&${params.toString()}`);
   };
 
   return (
diff --git a/app/Components/Receipt/Receipt.tsx b/app/Components/Receipt/Receipt.tsx
index 60efc9d..019ed29 100644
--- a/app/Components/Receipt/Receipt.tsx
+++ b/app/Components/Receipt/Receipt.tsx
@@ -2,7 +2,7 @@
 
 import { useState } from "react";
 import { PostReceipt } from "@/app/lib/postReceipt";
-import { useRouter } from "next/navigation";
+import { usePathname, useRouter, useSearchParams } from "next/navigation";
 
 import "./Receipt.css";
 
@@ -12,6 +12,8 @@ interface ReceiptsProps {
 
 function Receipt({ numAcount }: ReceiptsProps) {
   const router = useRouter();
+  const pathname = usePathname();
+  const searchParams = useSearchParams();
 
   const [folio, setFolio] = useState("");
   const [amount, setAmount] = useState("");
@@ -28,12 +30,11 @@ function Receipt({ numAcount }: ReceiptsProps) {
   //restrict this month//
 
   const handleSaveReceipt = async () => {
-    const currentUrl = new URL(window.location.href);
-    const params = new URLSearchParams();
+    const params = new URLSearchParams(searchParams.toString());
 
     const setError = (msg: string) => {
       params.set("error", msg);
-      router.push(`${currentUrl}&${params.toString()}`);
+      router.push(`${pathname}&${params.toString()}`);
     };
 
     if (!numAcount) {
@@ -66,7 +67,7 @@ function Receipt({ numAcount }: ReceiptsProps) {
 
       params.delete("error");
       params.set("success", "Recibo guardado");
-      router.push(`${currentUrl}&${params.toString()}`);
+      router.push(`${pathname}&${params.toString()}`);
     } catch (err: any) {
       setError(String(err));
     }
@@ -111,10 +112,9 @@ function Receipt({ numAcount }: ReceiptsProps) {
                 if (value === "" || numericValue <= 1000) {
                   setAmount(value);
                 } else {
-                  const currentUrl = new URL(window.location.href);
-                  const params = new URLSearchParams();
+                  const params = new URLSearchParams(searchParams.toString());
                   params.set("error", "El monto no puede superar $1000.00");
-                  router.push(`${currentUrl}&${params.toString()}`);
+                  router.push(`${pathname}&${params.toString()}`);
                 }
               }
             }}
diff --git a/app/globals.css b/app/globals.css
index 2431623..136fc4e 100644
--- a/app/globals.css
+++ b/app/globals.css
@@ -185,6 +185,10 @@ select:focus {
   transition: all 0.2s ease-in-out;
 }
 
+input[type="checkbox"]{
+  min-width: 3rem;
+}
+
 label {
   font-size: 2rem;
   font-weight: bold;
@@ -437,6 +441,20 @@ table tr {
   z-index: 10;
 }
 
+.checkbox-grid label {
+  display: inline-flex;
+  align-items: center;
+  font-size: 13px;
+  cursor: pointer;
+  margin-right: 1rem;
+}
+
+.checkbox-grid input[type="checkbox"] {
+  margin: 0;
+  padding: 0;
+  transform: scale(1); /* mantiene el tamaño */
+}
+
 @media (max-width: 1330px) {
   .centerGrid {
     display: flex !important;