diff --git a/lang/en.json b/lang/en.json
index d3d41ce..e97406a 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -122,10 +122,10 @@
     "Realized Gain/Loss": "Realized Gain/Loss",
     "Dividends Earned": "Dividends Earned",
     "Dividends": "Dividends",
-    "Dividend options": "Dividend options",
-    "Dividend options saved": "Dividend options saved",
+    "Holding options": "Holding options",
+    "Holding options saved": "Holding options saved",
     "Reinvest dividends": "Reinvest dividends",
-    "Automatically generate buy transactions for any dividends earned.": "Automatically generate buy transactions for any dividends earned.",
+    "Automatically generate buy transactions for any dividends earned": "Automatically generate buy transactions for any dividends earned",
     "Split": "Split",
     "Splits": "Splits",
     "No splits for :symbol yet": "No splits for :symbol yet",
@@ -185,7 +185,7 @@
     "Performance": "Performance",
     "Reset chart": "Reset chart",
     "Choose time period": "Choose time period",
-    "Edit Portfolio": "Edit Portfolio",
+    "Manage Portfolio": "Manage Portfolio",
     "Create Transaction": "Create Transaction",
     "Holding": "Holding",
     "Holdings": "Holdings",
diff --git a/lang/es.json b/lang/es.json
index 36a094b..25300ac 100644
--- a/lang/es.json
+++ b/lang/es.json
@@ -122,10 +122,10 @@
     "Realized Gain/Loss": "Ganancia/Pérdida Realizada",
     "Dividends Earned": "Dividendos Ganados",
     "Dividends": "Dividendos",
-    "Dividend options": "Opciones de dividendos",
-    "Dividend options saved": "Opciones de dividendos guardadas",
+    "Holding options": "Opciones de participaciones",
+    "Holding options saved": "Opciones de participaciones guardadas",
     "Reinvest dividends": "Reinvertir dividendos",
-    "Automatically generate buy transactions for any dividends earned.": "Genere automáticamente transacciones de compra para cualquier dividendo obtenido.",
+    "Automatically generate buy transactions for any dividends earned": "Genere automáticamente transacciones de compra para cualquier dividendo obtenido",
     "Split": "Division",
     "Splits": "Divisiones",
     "No splits for :symbol yet": "No hay divisiones para :symbol",
@@ -185,7 +185,7 @@
     "Performance": "Desempeño",
     "Reset chart": "Restablecer gráfico",
     "Choose time period": "Elegir período de tiempo",
-    "Edit Portfolio": "Editar Portafolio",
+    "Manage Portfolio": "Editar Portafolio",
     "Create Transaction": "Crear Transacción",
     "Holding": "Tenencia",
     "Holdings": "Tenencias",
diff --git a/resources/views/holding/show.blade.php b/resources/views/holding/show.blade.php
index d4f1e15..71dbcd5 100644
--- a/resources/views/holding/show.blade.php
+++ b/resources/views/holding/show.blade.php
@@ -12,19 +12,37 @@
 
         </x-ib-modal>
 
+        <x-ib-modal 
+            key="holding-options"
+            title="{{ __('Holding options') }}"
+        >
+            @livewire('holding-options-form', [
+                'holding' => $holding
+            ])
+
+        </x-ib-modal>
+
         <x-ib-toolbar>
             <x-slot:title>
                 <a href="{{ route('portfolio.show', ['portfolio' => $portfolio->id]) }}" title="{{ __('Portfolio') }}">
                     {{ $portfolio->title }}
                 </a> » <span title="{{ __('Holding') }}">{{ $holding->market_data->symbol }}</span>
+
             </x-slot:title>
 
+            <x-button 
+                title="{{ __('Holding options') }}" 
+                icon="o-pencil" 
+                class="btn-circle btn-ghost btn-sm text-secondary" 
+                @click="$dispatch('toggle-holding-options')"
+            />
+
             <x-ib-flex-spacer />
             
             <div>
                 <x-button 
                     label="{{ __('Create Transaction') }}" 
-                    class="btn-sm btn-primary" 
+                    class="btn-sm btn-primary whitespace-nowrap" 
                     @click="$dispatch('toggle-create-transaction')"
                 />
             </div>
@@ -100,30 +118,7 @@
 
             </x-ib-card>
 
-            <x-ib-card class="md:col-span-3">
-
-                <x-slot:title>
-                    {{ __('Dividends') }}
-
-                    <x-ib-flex-spacer/>
-
-                    <x-button 
-                        title="{{ __('Dividend options') }}" 
-                        icon="o-ellipsis-vertical" 
-                        class="btn-circle btn-ghost btn-sm text-secondary" 
-                        @click="$dispatch('toggle-dividend-options')"
-                    />
-                </x-slot:title>
-
-                <x-ib-modal 
-                    key="dividend-options"
-                    title="{{ __('Dividend options') }}"
-                >
-                    @livewire('holding-dividend-options-form', [
-                        'holding' => $holding
-                    ])
-
-                </x-ib-modal>
+            <x-ib-card title="{{ __('Dividends') }}" class="md:col-span-3">
 
                 @if($holding->dividends->isEmpty())
                     <div class="flex justify-center items-center h-full pb-10 text-secondary">
diff --git a/resources/views/livewire/holding-dividend-options-form.blade.php b/resources/views/livewire/holding-options-form.blade.php
similarity index 84%
rename from resources/views/livewire/holding-dividend-options-form.blade.php
rename to resources/views/livewire/holding-options-form.blade.php
index d24c66a..56c89e2 100644
--- a/resources/views/livewire/holding-dividend-options-form.blade.php
+++ b/resources/views/livewire/holding-options-form.blade.php
@@ -34,14 +34,14 @@ new class extends Component {
     {
         $this->holding->update($this->validate());
 
-        $this->success(__('Dividend options saved'));
+        $this->success(__('Holding options saved'));
 
-        $this->dispatch('toggle-dividend-options');
+        $this->dispatch('toggle-holding-options');
     }
 }; ?>
 
-<div class="" x-data="{ }">
-    <x-ib-form wire:submit="save" class="">
+<div class="" x-data="{ }"> {{-- grid lg:grid-cols-4 gap-10 --}}
+    <x-ib-form wire:submit="save" class=""> {{-- col-span-3 --}}
 
         <x-toggle 
             label="{{ __('Reinvest dividends') }}" 
diff --git a/resources/views/portfolio/show.blade.php b/resources/views/portfolio/show.blade.php
index db77818..8bc4cef 100644
--- a/resources/views/portfolio/show.blade.php
+++ b/resources/views/portfolio/show.blade.php
@@ -13,7 +13,7 @@
 
         <x-ib-drawer 
             key="manage-portfolio"
-            title="{{ $portfolio->title }}"
+            title="{{ __('Manage Portfolio') }}"
         >
             @livewire('manage-portfolio-form', [
                 'portfolio' => $portfolio, 
@@ -29,7 +29,7 @@
             @endif
 
             <x-button 
-                title="{{ __('Edit Portfolio') }}" 
+                title="{{ __('Manage Portfolio') }}" 
                 icon="o-pencil" 
                 class="btn-circle btn-ghost btn-sm text-secondary" 
                 @click="$dispatch('toggle-manage-portfolio')"
@@ -40,7 +40,7 @@
             <div>
                 <x-button 
                     label="{{ __('Create Transaction') }}" 
-                    class="btn-sm btn-primary" 
+                    class="btn-sm btn-primary whitespace-nowrap" 
                     @click="$dispatch('toggle-create-transaction')"
                 />
             </div>
diff --git a/resources/views/transaction/index.blade.php b/resources/views/transaction/index.blade.php
index 49c7c0a..75aaacc 100644
--- a/resources/views/transaction/index.blade.php
+++ b/resources/views/transaction/index.blade.php
@@ -16,7 +16,7 @@
             <div>
                 <x-button 
                     label="{{ __('Create Transaction') }}" 
-                    class="btn-sm btn-primary" 
+                    class="btn-sm btn-primary whitespace-nowrap " 
                     @click="$dispatch('toggle-create-transaction')"
                 />
             </div>