diff --git a/src/js/controller.js b/src/js/controller.js
index 3611bb8..fa94525 100644
--- a/src/js/controller.js
+++ b/src/js/controller.js
@@ -1,22 +1,17 @@
 angular.module('focaAgendarVisita')
     .controller('focaAgendarVisitaController', [
         '$scope', 'focaAgendarVisitaService', '$location', '$timeout',
-        '$uibModal', 'focaBotoneraLateralService', '$filter', 'focaLoginService',
+        '$uibModal', 'focaBotoneraLateralService', '$filter',
         'focaModalService', 'focaSeguimientoService',
         function($scope, focaAgendarVisitaService, $location, $timeout,
-            $uibModal, focaBotoneraLateralService, $filter, focaLoginService,
+            $uibModal, focaBotoneraLateralService, $filter,
             focaModalService, focaSeguimientoService
         ) {
             $scope.focused = 0;
             $scope.rol = 1;
             $scope.visita = {};
             $scope.now = new Date();
-            $scope.botonera = [
-                {
-                    label: 'Agendar',
-                    image: 'precios-condiciones.png'
-                }
-            ];
+            $scope.botonera = focaAgendarVisitaService.getBotonera();
             $timeout(function() {
                 focaBotoneraLateralService.showSalir(true);
                 focaBotoneraLateralService.showPausar(true);
@@ -38,6 +33,11 @@ angular.module('focaAgendarVisita')
                 modalInstance.result.then(
                     function(cliente) {
                         $scope.visita.cliente = cliente;
+                        $scope.$broadcast('addCabecera', {
+                            label: 'Cliente:',
+                            valor: $filter('rellenarDigitos')(cliente.cod, 3) + ' - ' +
+                                cliente.nom
+                        });
                     }
                 );
             };
@@ -62,9 +62,45 @@ angular.module('focaAgendarVisita')
                     size: 'md'
                 };
                 focaModalService.modal(parametrosModal).then(function(vendedorCobrador) {
-                    $scope.visita.visitante = vendedorCobrador;
+                    if (vendedorCobrador.rol === 3) {
+                        $uibModal.open(
+                            {
+                                ariaLabelledBy: 'Seleccionar tipo de visita',
+                                templateUrl: 'modal-tipo-visita.html',
+                                controller: 'focaModalTipoVisita',
+                                resolve: {},
+                                size: 'md'
+                            }
+                        )
+                        .result
+                        .then(function(res) {
+                            $scope.rol = res;
+                            $scope.visita.visitante = vendedorCobrador;
+                            $scope.$broadcast('addCabecera', {
+                                label: 'Vendedor:',
+                                valor: $filter('rellenarDigitos')(vendedorCobrador.NUM, 3) + ' - ' +
+                                    vendedorCobrador.NOM
+                            });
+                        });
+                        
+                    } else {
+                        $scope.visita.visitante = vendedorCobrador;
+                        $scope.$broadcast('addCabecera', {
+                            label: 'Vendedor:',
+                            valor: $filter('rellenarDigitos')(vendedorCobrador.NUM, 3) + ' - ' +
+                                vendedorCobrador.NOM
+                        });
+                    }
+
                 });
             };
+            $scope.seleccionarObservaciones = function() {
+                focaModalService
+                    .prompt('Ingrese observaciones', $scope.visita.observacion, true)
+                    .then(function(observacion) {
+                        $scope.visita.observacion = observacion;
+                    });
+            };
 
             $scope.next = function(key) {
                 if (key === 13) $scope.focused ++;
@@ -98,4 +134,15 @@ angular.module('focaAgendarVisita')
                     });
             };
         }
+    ])
+    .controller('focaModalTipoVisita', ['$uibModalInstance', '$scope',
+        function($uibModalInstance, $scope) {
+            $scope.cancel = function() {
+                $uibModalInstance.dismiss();
+            };
+
+            $scope.select = function(val) {
+                $uibModalInstance.close(val);
+            };
+        }
     ]);
diff --git a/src/js/service.js b/src/js/service.js
index 0390fa0..9018e69 100644
--- a/src/js/service.js
+++ b/src/js/service.js
@@ -3,6 +3,22 @@ angular.module('focaAgendarVisita')
         return {
             guardarVisita: function(visita) {
                 return $http.post(API_ENDPOINT.URL + '/visita', {visita: visita});
+            },
+            getBotonera: function() {
+                return  [
+                    {
+                        label: 'Cliente',
+                        image: 'precios-condiciones.png'
+                    },
+                    {
+                        label: 'Visitante',
+                        image: 'precios-condiciones.png'
+                    },
+                    {
+                        label: 'Observaciones',
+                        image: 'precios-condiciones.png'
+                    }
+                ]
             }
         };
     }]);
diff --git a/src/views/agendar-visita.html b/src/views/agendar-visita.html
index 5995274..12a3b91 100644
--- a/src/views/agendar-visita.html
+++ b/src/views/agendar-visita.html
@@ -4,82 +4,15 @@
     fecha="now"
     class="mb-0 col-lg-12"
     ></foca-cabecera-facturador>
-</div>
-<div class="row">
-    <div class="col-12 col-md-10 p-0 mt-4 border border-white rounded">
-        <form class="row py-2 mt-3 botonera-secundaria">
-            <div class="col-md-6">
-                <div class="form-group mb-2 col-md-12 d-md-flex">
-                    <label class="col-form-label col-md-4 col-12">Cliente</label>
-                    <div class="input-group col-md-8 col-12 pl-0">
-                        <input 
-                            class="form-control"
-                            type="text"
-                            teclado-virtual
-                            ng-model="visita.cliente.nom"
-                            foca-focus="focused == 1"
-                            ng-focus="focused = 1"
-                            ng-keypress="next($event.keyCode)"
-                            disabled>
-                        <div class="input-group-append">
-                            <button
-                                class="btn btn-outline-secondary form-control"
-                                title="Buscar"
-                                type="button"
-                                ng-click="seleccionarCliente()">
-                                <i class="fa fa-search" aria-hidden="true"></i>
-                            </button>
-                        </div>
-                    </div>
-                </div>
-                <div class="form-group mb-2 col-md-12 d-md-flex">
-                    <label class="col-form-label col-md-4 col-12">Visitante</label>
-                    <div class="input-group col-md-8 col-12 pl-0">
-                        <input 
-                            class="form-control"
-                            type="text"
-                            teclado-virtual
-                            ng-model="visita.visitante.NOM"
-                            foca-focus="focused == 1"
-                            ng-focus="focused = 1"
-                            ng-keypress="next($event.keyCode)"
-                            disabled>
-                        <div class="input-group-append">
-                            <button
-                                class="btn btn-outline-secondary form-control"
-                                title="Buscar"
-                                type="button"
-                                ng-click="seleccionarVisitante()">
-                                <i class="fa fa-search" aria-hidden="true"></i>
-                            </button>
-                        </div>
+    <div class="col-lg-12">
+        <div class="row">
+            <div class="col-12 col-md-10 col-lg-10 mt-4 border border-light rounded">
+                <div class="row py-2 botonera-secundaria">
+                    <div class="col-12 foca-facturador-px">
+                        <foca-botonera-facturador botones="botonera" max="6" class="row"></foca-botonera-facturador>
                     </div>
                 </div>
-                <div
-                    class="form-group mb-2 col-md-12 d-md-flex" 
-                    ng-show="visita.visitante.rol === 3">
-                    <label class="col-form-label col-md-4 col-12">Tipo</label>
-                    <div class="input-group col-md-8 col-12 pl-0">
-                        <select class="form-control" ng-model="rol">
-                            <option value="1">Vendedor</option>
-                            <option value="2">Cobrador</option>
-                        </select>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group mb-2 col-md-6 d-md-flex">
-                <label class="col-form-label col-md-4 col-12">Observaciones</label>
-                <div class="input-group col-md-8 col-12">
-                    <textarea 
-                        rows="5"
-                        class="form-control"
-                        teclado-virtual
-                        ng-model="visita.observacion"
-                        foca-focus="focused == 1"
-                        ng-focus="focused = 1"
-                        ng-keypress="next($event.keyCode)">
-                </div>
             </div>
-        </form>
+        </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/views/modal-tipo-visita.html b/src/views/modal-tipo-visita.html
new file mode 100644
index 0000000..b66b6a7
--- /dev/null
+++ b/src/views/modal-tipo-visita.html
@@ -0,0 +1,46 @@
+<div class="modal-header py-1">
+    <div class="row w-100">
+        <div class="col-12">
+            <h5 class="modal-title my-1">Seleccionar tipo de visita</h5>
+        </div>
+    </div>
+</div>
+<div class="modal-body" id="modal-body">
+    <table class="table table-striped table-sm">
+        <thead>
+            <tr>
+                <th>Tipo</th>
+                <th></th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <td>Nota de pedido</td>
+                <td>
+                    <button
+                        type="button"
+                        class="btn btn-secondary btn-xs p-1 float-right"
+                        ng-click="select(1)"
+                    >
+                        <i class="fa fa-circle-thin" aria-hidden="true"></i>
+                    </button>
+                </td>
+            </tr>
+            <tr>
+                <td>Cobranza</td>
+                <td>
+                    <button
+                        type="button"
+                        class="btn btn-secondary btn-xs p-1 float-right"
+                        ng-click="select(2)"
+                    >
+                        <i class="fa fa-circle-thin" aria-hidden="true"></i>
+                    </button>
+                </td>
+            </tr>
+        </tbody>
+    </table>
+</div>
+<div class="modal-footer py-1">
+    <button class="btn btn-sm btn-secondary" type="button" ng-click="cancel()">Cancelar</button>
+</div>