diff --git a/Blocktrust.CredentialWorkflow.Web/Components/Account/Pages/Manage/IssuingKeys.razor b/Blocktrust.CredentialWorkflow.Web/Components/Account/Pages/Manage/IssuingKeys.razor
index 08706a7..b108542 100644
--- a/Blocktrust.CredentialWorkflow.Web/Components/Account/Pages/Manage/IssuingKeys.razor
+++ b/Blocktrust.CredentialWorkflow.Web/Components/Account/Pages/Manage/IssuingKeys.razor
@@ -1,86 +1,174 @@
@page "/Account/Manage/IssuingKeys"
@using System.ComponentModel.DataAnnotations
+@using System.Text.RegularExpressions
@using Blocktrust.CredentialWorkflow.Core.Commands.Tenant.CreateIssuingKey
@using Blocktrust.CredentialWorkflow.Core.Commands.Tenant.DeleteIssuingKey
@using Blocktrust.CredentialWorkflow.Core.Commands.Tenant.GetIssuingKeys
@using Blocktrust.CredentialWorkflow.Core.Domain.IssuingKey
@using MediatR
+@using Microsoft.AspNetCore.Components.Forms
@inject IMediator Mediator
@inject IdentityUserAccessor UserAccessor
@inject IdentityRedirectManager RedirectManager
-
DID: @key.Did
-Type: @key.KeyType
-Public Key: @TruncateKey(key.PublicKey)
-Private Key: @TruncateKey(key.PrivateKey)
-Created: @key.CreatedUtc
+Create and manage your issuing keys for credential management.
+No issuing keys added yet.
++ DID: + @TruncateKey(key.Did) +
++ Type: + @key.KeyType +
++ Public Key: + @TruncateKey(key.PublicKey) +
++ Private Key: + @TruncateKey(key.PrivateKey) +
++ Created @key.CreatedUtc.ToLocalTime().ToString("g") +
+