diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageStrings.uni b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageStrings.uni
index 058680e025..c961939fab 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageStrings.uni
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageStrings.uni
@@ -44,9 +44,9 @@
                                        #language fr-FR  "ACME® EFI BIOS Version 13.5 Release 1039.92"
 #string STR_FRONT_PAGE_BANNER_3_LEFT   #language en-US  "Serial Number: 1Z123456789MARMAR (Need SMBIOS entries)"
                                        #language fr-FR  "Numéro de série: 1Z123456789MARMAR (Les entrées de SMBIOS de besoin)"
-#string STR_CONTINUE_PROMPT            #language en-US  "Continue"
-                                       #language fr-FR  "Continuer"
-#string STR_CONTINUE_HELP              #language en-US  "This selection will direct the system to continue to booting process"
+#string STR_CONTINUE_PROMPT            #language en-US  "Default Boot"
+                                       #language fr-FR  "Default Boot"
+#string STR_CONTINUE_HELP              #language en-US  "Boot the Default Selection"
                                        #language fr-FR  "Cette sélection dirigera le système pour continuer au charger de procédé"
 #string STR_LANGUAGE_SELECT            #language en-US  "Select Language"
                                        #language fr-FR  "Choisir la Langue"
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
index a2d92dff51..8ed38be4e2 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
@@ -48,58 +48,24 @@ formset
     banner
       title = STRING_TOKEN(STR_FRONT_PAGE_COMPUTER_MODEL),
       line  1,
-      align left;
-
-    banner
-      title = STRING_TOKEN(STR_FRONT_PAGE_CPU_MODEL),
-      line  2,
-      align left;
-
-    banner
-      title = STRING_TOKEN(STR_FRONT_PAGE_CPU_SPEED),
-      line  2,
-      align right;
+      align center;
 
     banner
       title = STRING_TOKEN(STR_FRONT_PAGE_BIOS_VERSION),
       line  3,
       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  3,
-      align right;
-
-//    banner
-//      title = STRING_TOKEN(STR_FRONT_PAGE_BANNER_0_LEFT),
-//      line  0,
-//      align left;
-
-//    banner
-//      title = STRING_TOKEN(STR_FRONT_PAGE_BANNER_0_RIGHT),
-//      line  0,
-//      align right;
-
-//    banner
-//      title = STRING_TOKEN(STR_FRONT_PAGE_BANNER_1_LEFT),
-//      line  1,
-//      align left;
-
-//    banner
-//      title = STRING_TOKEN(STR_FRONT_PAGE_BANNER_1_RIGHT),
-//      line  1,
-//      align right;
-
-//    banner
-//      title = STRING_TOKEN(STR_FRONT_PAGE_BANNER_2_LEFT),
-//      line  2,
-//      align left;
-
-//    banner
-//      title = STRING_TOKEN(STR_FRONT_PAGE_BANNER_3_LEFT),
-//      line  3,
-//      align left;
+      line  5,
+      align left;
 
+    subtitle text = STRING_TOKEN(STR_NULL_STRING);
 
     text
       help    = STRING_TOKEN(STR_CONTINUE_HELP),
@@ -107,12 +73,7 @@ formset
       flags   = INTERACTIVE,
       key     = FRONT_PAGE_KEY_CONTINUE;
 
-    label LABEL_SELECT_LANGUAGE;
-    //
-    // This is where we will dynamically add a OneOf type op-code to select
-    // Languages from the currently available choices
-    //
-    label LABEL_END;
+    subtitle text = STRING_TOKEN(STR_NULL_STRING);
 
     goto FRONT_PAGE_ITEM_THREE,
       prompt  = STRING_TOKEN(STR_BOOT_MANAGER),
@@ -120,11 +81,7 @@ formset
       flags   = INTERACTIVE,
       key     = FRONT_PAGE_KEY_BOOT_MANAGER;
 
-    goto FRONT_PAGE_ITEM_FOUR,
-      prompt  = STRING_TOKEN(STR_DEVICE_MANAGER),
-      help    = STRING_TOKEN(STR_DEVICE_MANAGER_HELP),
-      flags   = INTERACTIVE,
-      key     = FRONT_PAGE_KEY_DEVICE_MANAGER;
+    subtitle text = STRING_TOKEN(STR_NULL_STRING);
 
     goto FRONT_PAGE_ITEM_FIVE,
       prompt  = STRING_TOKEN(STR_BOOT_MAINT_MANAGER),