diff --git a/src/app/components/comanda/comanda.component.html b/src/app/components/comanda/comanda.component.html
index ce624fa..54ad2e5 100644
--- a/src/app/components/comanda/comanda.component.html
+++ b/src/app/components/comanda/comanda.component.html
@@ -1,4 +1,4 @@
-<div class="container-fluid fade-in p-0">
+<div class="container-fluid h-100 fade-in p-0 pr-2">
 
     <div class="row z-index-0 fixed-top m-0 w-100">
       <div class="col-12 p-3">
@@ -6,60 +6,65 @@
       </div>
     </div>
 
-  <div class="row pt-5 m-2">
+  <div class="row pt-5 m-3">
     <div class="col-12">
       <p class="m-0 h2 text-center">Pedidos a elaborar</p>
     </div>
   </div>
 
-  <div class="card-columns m-1 fade-in disable-user-select">
-    <div
-      *ngFor="let comanda of comandas"
-      class="card fade-in rounded-xs shadow-sm"
-      [ngClass]="{
-        'bg-light': comanda.estado === 1,
-        'bg-danger': comanda.estado === 2,
-        'bg-success swing-out-top-bck': comanda.estado === 3
-      }">
-      <div class="card-body p-2">
-        <p class="h1 card-title text-center mb-1">{{comanda.id.toString().slice(comanda.id.toString().length - 2)}}</p>
-        <!-- TODO: Implementar moment -->
-        <p class="card-title text-center mb-1">{{comanda.fechafinelaboracion | date: 'dd-MM-yyyy HH:mm' : '+0000'}}</p>
-        <p
-          *ngFor="let detalle of comanda.detalles"
-          [ngClass]="
-          {
-            'border-secondary': comanda.estado === 1,
-            'border-light': comanda.estado != 1
-          }"
-          class="card-text border-top pt-2 mb-2">
-          <small>
-            {{detalle.articulo.DET_LAR}}
-          </small><br>
-          <small>
-            CANT. {{detalle.cantidad}}
-          </small>
-        </p>
-        <button
-          *ngIf="comanda.estado === 1"
-          class="btn btn-block btn-danger shadow-sm"
-          (click)="updateComanda(comanda, 2, 'En elaboracion')">
-          Elaborar
-        </button>
-        <button
-          *ngIf="comanda.estado === 2"
-          class="btn btn-block btn-success shadow-sm"
-          (click)="updateComanda(comanda, 3, 'Terminado')">
-          Terminar
-        </button>
-        <button
-          *ngIf="comanda.estado === 2"
-          class="btn btn-block btn-light btn-sm shadow-sm p-0"
-          (click)="updateComanda(comanda, 1, 'Pagado')">
-          <span class="pr-2 h6"><small>Deshacer</small></span>
-          <i class="fa fa-undo text-warning" aria-hidden="true"></i>
-        </button>
+  <div class="row h-85 m-0 overflow-scroll">
+    <div class="col-12 px-2">
+      <div class="card-columns h-100 m-1 fade-in disable-user-select">
+        <div
+          *ngFor="let comanda of comandas"
+          class="card fade-in rounded-xs shadow-sm"
+          [ngClass]="{
+            'bg-light': comanda.estado === 1,
+            'bg-danger': comanda.estado === 2,
+            'bg-success swing-out-top-bck': comanda.estado === 3
+          }">
+          <div class="card-body p-2">
+            <p class="h1 card-title text-center mb-1">{{comanda.id.toString().slice(comanda.id.toString().length - 2)}}</p>
+            <!-- TODO: Implementar moment -->
+            <p class="card-title text-center mb-1">{{comanda.fechafinelaboracion | date: 'dd-MM-yyyy HH:mm' : '+0000'}}</p>
+            <p
+              *ngFor="let detalle of comanda.detalles"
+              [ngClass]="
+              {
+                'border-secondary': comanda.estado === 1,
+                'border-light': comanda.estado != 1
+              }"
+              class="card-text border-top pt-2 mb-2">
+              <small>
+                {{detalle.articulo.DET_LAR}}
+              </small><br>
+              <small>
+                CANT. {{detalle.cantidad}}
+              </small>
+            </p>
+            <button
+              *ngIf="comanda.estado === 1"
+              class="btn btn-block btn-danger shadow-sm"
+              (click)="updateComanda(comanda, 2, 'En elaboracion')">
+              Elaborar
+            </button>
+            <button
+              *ngIf="comanda.estado === 2"
+              class="btn btn-block btn-success shadow-sm"
+              (click)="updateComanda(comanda, 3, 'Terminado')">
+              Terminar
+            </button>
+            <button
+              *ngIf="comanda.estado === 2"
+              class="btn btn-block btn-light btn-sm shadow-sm p-0"
+              (click)="updateComanda(comanda, 1, 'Pagado')">
+              <span class="pr-2 h6"><small>Deshacer</small></span>
+              <i class="fa fa-undo text-warning" aria-hidden="true"></i>
+            </button>
+          </div>
+        </div>
       </div>
     </div>
   </div>
+
 </div>
diff --git a/src/app/components/comanda/comanda.component.scss b/src/app/components/comanda/comanda.component.scss
index 47e51a6..228e52e 100644
--- a/src/app/components/comanda/comanda.component.scss
+++ b/src/app/components/comanda/comanda.component.scss
@@ -9,6 +9,10 @@
   }
 }
 
+.h-85{
+  height: 85% !important;  
+}
+
 @media (min-width: 1200px) {
   .card-columns {
     column-count: 7 !important;