diff --git a/Marechai/Marechai.csproj b/Marechai/Marechai.csproj
index d9284521..830ed0ac 100644
--- a/Marechai/Marechai.csproj
+++ b/Marechai/Marechai.csproj
@@ -97,6 +97,9 @@
     <Content Update="Pages\Admin\Details\InstructionSetExtension.razor">
       <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
     </Content>
+    <Content Update="Pages\Admin\Details\InstructionSet.razor">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <_ContentIncludedByDefault Remove="Areas\Admin\Views\BrowserTests\Delete.cshtml" />
diff --git a/Marechai/Areas/Admin/Views/InstructionSets/Details.cshtml b/Marechai/Pages/Admin/Details/InstructionSet.razor
similarity index 66%
rename from Marechai/Areas/Admin/Views/InstructionSets/Details.cshtml
rename to Marechai/Pages/Admin/Details/InstructionSet.razor
index 412c2f0b..5d36114c 100644
--- a/Marechai/Areas/Admin/Views/InstructionSets/Details.cshtml
+++ b/Marechai/Pages/Admin/Details/InstructionSet.razor
@@ -1,5 +1,5 @@
-@{
-    /******************************************************************************
+@{
+/******************************************************************************
 // MARECHAI: Master repository of computing history artifacts information
 // ----------------------------------------------------------------------------
 //
@@ -29,25 +29,28 @@
 // Copyright © 2003-2020 Natalia Portillo
 *******************************************************************************/
 }
-@model Marechai.Database.Models.InstructionSet
 
-@{
-    ViewData["Title"] = "Details";
+@page "/admin/instruction_sets/details/{Id:int}"
+@inherits OwningComponentBase<InstructionSetsService>
+@inject IStringLocalizer<InstructionSetsService> L
+@attribute [Authorize(Roles = "UberAdmin, Admin")]
+<h3>@L["Instruction set details"]</h3>
+<hr />
+
+@if (!_loaded)
+{
+    <p align="center">@L["Loading..."]</p>
+
+    return;
 }
-<h2>Details</h2>
+
 <div>
-    <h4>Instruction set</h4>
-    <hr />
-    <dl class="dl-horizontal">
-        <dt>
-            @Html.DisplayNameFor(model => model.Name)
-        </dt>
-        <dd>
-            @Html.DisplayFor(model => model.Name)
-        </dd>
-    </dl>
+    <Field>
+        <FieldLabel>@L["Name"]</FieldLabel>
+        <TextEdit ReadOnly="!_editable" @bind-Text="@_model.Name"/>
+    </Field>
 </div>
 <div>
-    <a asp-action="Edit" asp-route-id="@Model.Id" class="btn btn-primary">Edit</a>
-    <a asp-action="Index" class="btn btn-secondary">Back to List</a>
+    <span class="btn btn-primary">@L["Edit"]</span>
+    <a href="/admin/instruction_sets" class="btn btn-secondary">@L["Back to list"]</a>
 </div>
\ No newline at end of file
diff --git a/Marechai/Pages/Admin/Details/InstructionSet.razor.cs b/Marechai/Pages/Admin/Details/InstructionSet.razor.cs
new file mode 100644
index 00000000..35bf2149
--- /dev/null
+++ b/Marechai/Pages/Admin/Details/InstructionSet.razor.cs
@@ -0,0 +1,29 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components;
+
+namespace Marechai.Pages.Admin.Details
+{
+    public partial class InstructionSet
+    {
+        bool                           _editable;
+        bool                           _loaded;
+        Database.Models.InstructionSet _model;
+        [Parameter]
+        public int Id { get; set; }
+
+        protected override async Task OnAfterRenderAsync(bool firstRender)
+        {
+            if(_loaded)
+                return;
+
+            _loaded = true;
+
+            if(Id <= 0)
+                return;
+
+            _model = await Service.GetAsync(Id);
+
+            StateHasChanged();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Marechai/Pages/Admin/InstructionSets.razor b/Marechai/Pages/Admin/InstructionSets.razor
index ae0807df..97d1ae23 100644
--- a/Marechai/Pages/Admin/InstructionSets.razor
+++ b/Marechai/Pages/Admin/InstructionSets.razor
@@ -63,9 +63,7 @@
                 @item.Name
             </td>
             <td>
-                <span class="btn btn-primary">
-                    @L["Details"]
-                </span>
+                <a class="btn btn-primary" href="/admin/instruction_sets/details/@item.Id">@L["Details"]</a>
                 <span class="btn btn-secondary">
                     @L["Edit"]
                 </span>
diff --git a/Marechai/Resources/Services/InstructionSetsService.es.resx b/Marechai/Resources/Services/InstructionSetsService.es.resx
index 18a25675..9e0285fd 100644
--- a/Marechai/Resources/Services/InstructionSetsService.es.resx
+++ b/Marechai/Resources/Services/InstructionSetsService.es.resx
@@ -158,4 +158,12 @@
     <value>Cancelar</value>
     <comment>Cancel</comment>
   </data>
+  <data name="Instruction set details" xml:space="preserve">
+    <value>Detalles de arquitectura</value>
+    <comment>Instruction set details</comment>
+  </data>
+  <data name="Back to list" xml:space="preserve">
+    <value>Volver a la lista</value>
+    <comment>Back to list</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Marechai/Services/InstructionSetsService.cs b/Marechai/Services/InstructionSetsService.cs
index 75988999..4b36ea1f 100644
--- a/Marechai/Services/InstructionSetsService.cs
+++ b/Marechai/Services/InstructionSetsService.cs
@@ -15,6 +15,8 @@ namespace Marechai.Services
         public async Task<List<InstructionSet>> GetAsync() =>
             await _context.InstructionSets.OrderBy(s => s.Name).ToListAsync();
 
+        public async Task<InstructionSet> GetAsync(int id) => await _context.InstructionSets.FindAsync(id);
+
         public async Task DeleteAsync(int id)
         {
             InstructionSet item = await _context.InstructionSets.FindAsync(id);