diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
index 1895f5e28b..fd4cd58389 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
@@ -926,10 +926,10 @@ UpdateFrontPageStrings (
       Str2Index = SmbiosTable.Type0->BiosReleaseDate;
       GetOptionalStringByIndex ((CHAR8*)((UINT8*)SmbiosTable.Raw + SmbiosTable.Hdr->Length), StrIndex, &NewString);
       GetOptionalStringByIndex ((CHAR8*)((UINT8*)SmbiosTable.Raw + SmbiosTable.Hdr->Length), Str2Index, &NewString2);
-      StrCatS (NewString3, 0x80 / sizeof (CHAR16), L"FW: ");
+      StrCatS (NewString3, 0x80 / sizeof (CHAR16), L"Version: ");
       StrCatS (NewString3, 0x80 / sizeof (CHAR16), NewString);
-      StrCatS (NewString3, 0x80 / sizeof (CHAR16), L" ");
-      StrCatS (NewString3, 0x80 / sizeof (CHAR16), NewString2);
+      // StrCatS (NewString3, 0x80 / sizeof (CHAR16), L" ");
+      // StrCatS (NewString3, 0x80 / sizeof (CHAR16), NewString2);
       TokenToUpdate = STRING_TOKEN (STR_FRONT_PAGE_BIOS_VERSION);
       HiiSetString (gFrontPagePrivate.HiiHandle, TokenToUpdate, NewString3, NULL);
       FreePool (NewString);
@@ -959,6 +959,16 @@ UpdateFrontPageStrings (
       TokenToUpdate = STRING_TOKEN (STR_FRONT_PAGE_TITLE);
       HiiSetString (gFrontPagePrivate.HiiHandle, TokenToUpdate, NewString3, NULL);
       FreePool (NewString);
+
+      NewString3 = AllocateZeroPool (0x60);
+
+      StrIndex = SmbiosTable.Type1->Version;
+      GetOptionalStringByIndex ((CHAR8*)((UINT8*)SmbiosTable.Raw + SmbiosTable.Hdr->Length), StrIndex, &NewString);
+      StrCatS (NewString3, 0x60 / sizeof (CHAR16), L"Model: ");
+      StrCatS (NewString3, 0x60 / sizeof (CHAR16), NewString);
+      TokenToUpdate = STRING_TOKEN (STR_FRONT_PAGE_COMPUTER_MODEL);
+      HiiSetString (gFrontPagePrivate.HiiHandle, TokenToUpdate, NewString3, NULL);
+      FreePool (NewString);
     }
 
     SmbiosTable = GetSmbiosTableFromType (EntryPoint, SMBIOS_TYPE_PROCESSOR_INFORMATION , 0);
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
index 8ed38be4e2..3579717781 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
@@ -45,25 +45,29 @@ formset
   form formid = FRONT_PAGE_FORM_ID,
        title  = STRING_TOKEN(STR_FRONT_PAGE_TITLE);
 
-    banner
-      title = STRING_TOKEN(STR_FRONT_PAGE_COMPUTER_MODEL),
-      line  1,
-      align center;
+    subtitle text = STRING_TOKEN(STR_FRONT_PAGE_COMPUTER_MODEL);
+    subtitle text = STRING_TOKEN(STR_FRONT_PAGE_BIOS_VERSION);
+    subtitle text = STRING_TOKEN(STR_NULL_STRING);
 
-    banner
-      title = STRING_TOKEN(STR_FRONT_PAGE_BIOS_VERSION),
-      line  3,
-      align left;
+    //banner
+    //  title = STRING_TOKEN(STR_FRONT_PAGE_COMPUTER_MODEL),
+    //  line  1,
+    //  align center;
 
-    banner
-      title = STRING_TOKEN(STR_FRONT_PAGE_CPU_MODEL),
-      line  4,
-      align left;
+    //banner
+    //  title = STRING_TOKEN(STR_FRONT_PAGE_BIOS_VERSION),
+    //  line  3,
+    //  align left;
 
-    banner
-      title = STRING_TOKEN(STR_FRONT_PAGE_MEMORY_SIZE),
-      line  5,
-      align left;
+    //banner
+    //  title = STRING_TOKEN(STR_FRONT_PAGE_CPU_MODEL),
+    //  line  4,
+    //  align left;
+
+    //banner
+    //  title = STRING_TOKEN(STR_FRONT_PAGE_MEMORY_SIZE),
+    //  line  5,
+    //  align left;
 
     subtitle text = STRING_TOKEN(STR_NULL_STRING);
 
@@ -73,7 +77,7 @@ formset
       flags   = INTERACTIVE,
       key     = FRONT_PAGE_KEY_CONTINUE;
 
-    subtitle text = STRING_TOKEN(STR_NULL_STRING);
+    //subtitle text = STRING_TOKEN(STR_NULL_STRING);
 
     goto FRONT_PAGE_ITEM_THREE,
       prompt  = STRING_TOKEN(STR_BOOT_MANAGER),
@@ -81,7 +85,7 @@ formset
       flags   = INTERACTIVE,
       key     = FRONT_PAGE_KEY_BOOT_MANAGER;
 
-    subtitle text = STRING_TOKEN(STR_NULL_STRING);
+    //subtitle text = STRING_TOKEN(STR_NULL_STRING);
 
     goto FRONT_PAGE_ITEM_FIVE,
       prompt  = STRING_TOKEN(STR_BOOT_MAINT_MANAGER),