diff --git a/src/more-infos/more-info-configurator.html b/src/more-infos/more-info-configurator.html
index 0a9ea2daad..e7148aab70 100644
--- a/src/more-infos/more-info-configurator.html
+++ b/src/more-infos/more-info-configurator.html
@@ -46,13 +46,14 @@
 
         <p hidden$='[[!stateObj.attributes.description]]'>
           [[stateObj.attributes.description]]
-          <a
-            hidden$='[[!stateObj.attributes.link_url]]'
-            href='[[stateObj.attributes.link_url]]'
-            target='_blank'
-          >
-            [[stateObj.attributes.link_name]]
-          </a>
+          <p hidden$='[[!stateObj.attributes.link_url]]'>
+            <a
+              href='[[stateObj.attributes.link_url]]'
+              target='_blank'
+            >
+              [[stateObj.attributes.link_name]]
+            </a>
+          </p>
         </p>
 
         <p class='error' hidden$='[[!stateObj.attributes.errors]]'>
@@ -72,7 +73,7 @@
           ></paper-input>
         </template>
 
-        <p class='submit'>
+        <p class='submit' hidden$='[[!stateObj.attributes.submit_caption]]'>
           <paper-button
             raised
             disabled='[[isConfiguring]]'
@@ -82,7 +83,7 @@
               active='[[isConfiguring]]'
               hidden='[[!isConfiguring]]'
               alt='Configuring'></paper-spinner>
-            [[submitCaption]]
+            [[stateObj.attributes.submit_caption]]
           </paper-button>
 
         </p>
@@ -116,11 +117,6 @@ Polymer({
       value: false,
     },
 
-    submitCaption: {
-      type: String,
-      computed: 'computeSubmitCaption(stateObj)',
-    },
-
     fieldInput: {
       type: Object,
       value: function () { return {}; },
@@ -131,10 +127,6 @@ Polymer({
     return stateObj.state === 'configure';
   },
 
-  computeSubmitCaption: function (stateObj) {
-    return stateObj.attributes.submit_caption || 'Set configuration';
-  },
-
   fieldChanged: function (ev) {
     var el = ev.target;
     this.fieldInput[el.name] = el.value;