diff --git a/lib/alert/addon/components/alert/form-cluster-rules/template.hbs b/lib/alert/addon/components/alert/form-cluster-rules/template.hbs
index 5a33ee546..99eb56c53 100644
--- a/lib/alert/addon/components/alert/form-cluster-rules/template.hbs
+++ b/lib/alert/addon/components/alert/form-cluster-rules/template.hbs
@@ -28,6 +28,8 @@
       <div class="col span-2">
         <label class="acc-label">
           <span class="pr-10"> {{radio-button selection=model._targetType value="normalEvent"}} {{t 'alertPage.newOrEdit.normal'}} </span>
+        </label>
+        <label class="acc-label">
           {{radio-button selection=model._targetType value="warningEvent"}} {{t 'alertPage.newOrEdit.warning'}}
         </label>
       </div>
diff --git a/lib/alert/addon/index/template.hbs b/lib/alert/addon/index/template.hbs
index 86ce673f7..dd6c80f24 100644
--- a/lib/alert/addon/index/template.hbs
+++ b/lib/alert/addon/index/template.hbs
@@ -5,4 +5,4 @@
   </div>
 </section>
 
-{{alert-table alerts=model.alerts notifiers=model.notifiers}}
\ No newline at end of file
+{{alert-table alerts=model.alerts notifiers=model.notifiers}}
diff --git a/lib/logging/addon/components/logging/target-elasticsearch/component.js b/lib/logging/addon/components/logging/target-elasticsearch/component.js
index c10cd3f3b..a65b179e4 100644
--- a/lib/logging/addon/components/logging/target-elasticsearch/component.js
+++ b/lib/logging/addon/components/logging/target-elasticsearch/component.js
@@ -4,6 +4,10 @@ import { get } from '@ember/object';
 
 export default Component.extend(es, {
 
+  didInsertElement() {
+    this.$('#elasticsearch-endpoint').focus()
+  },
+
   indexFormat: function()  {
     const ps = get(this, 'pageScope');
     return ps === 'cluster' ? '${clusterName}-${dateFormat}' : '${clusterName}_${projectName}-${dateFormat}';
diff --git a/lib/logging/addon/components/logging/target-elasticsearch/template.hbs b/lib/logging/addon/components/logging/target-elasticsearch/template.hbs
index 017a1ef9f..9e49a991b 100644
--- a/lib/logging/addon/components/logging/target-elasticsearch/template.hbs
+++ b/lib/logging/addon/components/logging/target-elasticsearch/template.hbs
@@ -9,6 +9,7 @@
           value=config.endpoint
           classNames="form-control"
           placeholder=(t 'loggingPage.endpointPlaceholder')
+          id="elasticsearch-endpoint"
       }}
     </div>
     <p class="text-info text-small">{{t 'loggingPage.elasticsearch.endpointHelpText'}}</p>
@@ -71,4 +72,4 @@
   </section>
 </div>
 
-{{logging/form-log-format logPreview=logPreview model=model}}
\ No newline at end of file
+{{logging/form-log-format logPreview=logPreview model=model}}
diff --git a/lib/logging/addon/components/logging/target-embedded/component.js b/lib/logging/addon/components/logging/target-embedded/component.js
index ff9cff2b6..3d2ef9505 100644
--- a/lib/logging/addon/components/logging/target-embedded/component.js
+++ b/lib/logging/addon/components/logging/target-embedded/component.js
@@ -12,6 +12,10 @@ export default Component.extend(es, {
     set(this, 'limitsCpu', limitsCpu / 1000);
   },
 
+  didInsertElement() {
+    this.$('#embedded-cpuRequests').focus()
+  },
+
   requestsCpuChanged: function() {
     const requestsCpu = get(this, 'requestsCpu');
     set(this, 'config.requestsCpu', requestsCpu * 1000);
diff --git a/lib/logging/addon/components/logging/target-embedded/template.hbs b/lib/logging/addon/components/logging/target-embedded/template.hbs
index 365672068..95c9c3c10 100644
--- a/lib/logging/addon/components/logging/target-embedded/template.hbs
+++ b/lib/logging/addon/components/logging/target-embedded/template.hbs
@@ -12,6 +12,7 @@
           value=requestsCpu
           className="form-control"
           placeholder=(t 'loggingPage.embedded.cpuRequests.placeholder')
+          id="embedded-cpuRequests"
       }}
       <p class="text-small text-info">{{t 'loggingPage.embedded.cpuRequests.helpText'}}</p>
     </div>
@@ -80,4 +81,4 @@
     }}
   </div>
 </section>
-{{logging/form-log-format logPreview=logPreview model=model}}
\ No newline at end of file
+{{logging/form-log-format logPreview=logPreview model=model}}
diff --git a/lib/logging/addon/components/logging/target-kafka/component.js b/lib/logging/addon/components/logging/target-kafka/component.js
index 343479e02..602b43187 100644
--- a/lib/logging/addon/components/logging/target-kafka/component.js
+++ b/lib/logging/addon/components/logging/target-kafka/component.js
@@ -20,6 +20,10 @@ export default Component.extend({
     }
   },
 
+  didInsertElement() {
+    this.$('#kafka-endpoint').focus()
+  },
+
   logPreview: function() {
     const str = get(this, 'fieldsStr');
     return `{
diff --git a/lib/logging/addon/components/logging/target-kafka/template.hbs b/lib/logging/addon/components/logging/target-kafka/template.hbs
index 15a340b95..0a4883be4 100644
--- a/lib/logging/addon/components/logging/target-kafka/template.hbs
+++ b/lib/logging/addon/components/logging/target-kafka/template.hbs
@@ -18,6 +18,7 @@
           value=config.zookeeperEndpoint
           classNames="form-control"
           placeholder=(t 'loggingPage.endpointPlaceholder')
+          id="kafka-endpoint"
       }}
     </div>
     <p class="text-info text-small mb-0">{{t 'loggingPage.kafka.zookeeperHelpText'}}</p>
@@ -68,4 +69,4 @@
   </div>
 </div>
 
-{{logging/form-log-format logPreview=logPreview model=model}}
\ No newline at end of file
+{{logging/form-log-format logPreview=logPreview model=model}}
diff --git a/lib/logging/addon/components/logging/target-splunk/component.js b/lib/logging/addon/components/logging/target-splunk/component.js
index 8b69f37d3..a0b397f4d 100644
--- a/lib/logging/addon/components/logging/target-splunk/component.js
+++ b/lib/logging/addon/components/logging/target-splunk/component.js
@@ -5,6 +5,10 @@ import { alias } from '@ember/object/computed'
 export default Component.extend({
   config: alias('model.config'),
 
+  didInsertElement() {
+    this.$('#splunk-endpoint').focus()
+  },
+
   logPreview: function() {
     const fieldsStr = get(this, 'fieldsStr');
     const template = `{
diff --git a/lib/logging/addon/components/logging/target-splunk/template.hbs b/lib/logging/addon/components/logging/target-splunk/template.hbs
index d9d58da13..c739130f5 100644
--- a/lib/logging/addon/components/logging/target-splunk/template.hbs
+++ b/lib/logging/addon/components/logging/target-splunk/template.hbs
@@ -13,6 +13,7 @@
         value=config.endpoint
         classNames="form-control"
         placeholder=(t 'loggingPage.endpointPlaceholder')
+        id="splunk-endpoint"
     }}
   </div>
 
@@ -44,4 +45,4 @@
   </div>
 </section>
 
-{{logging/form-log-format logPreview=logPreview model=model}}
\ No newline at end of file
+{{logging/form-log-format logPreview=logPreview model=model}}
diff --git a/lib/logging/addon/components/logging/target-syslog/component.js b/lib/logging/addon/components/logging/target-syslog/component.js
index 638886bcd..c3df1db30 100644
--- a/lib/logging/addon/components/logging/target-syslog/component.js
+++ b/lib/logging/addon/components/logging/target-syslog/component.js
@@ -27,6 +27,10 @@ export default Component.extend({
     this.set('severities', SEVERITIES);
   },
 
+  didInsertElement() {
+    this.$('#syslog-endpoint').focus()
+  },
+
   logPreview: function() {
     const str = get(this, 'fieldsStr');
     const program = get(this, 'config.program') || '';
diff --git a/lib/logging/addon/components/logging/target-syslog/template.hbs b/lib/logging/addon/components/logging/target-syslog/template.hbs
index 0569be97c..993473f17 100644
--- a/lib/logging/addon/components/logging/target-syslog/template.hbs
+++ b/lib/logging/addon/components/logging/target-syslog/template.hbs
@@ -9,6 +9,7 @@
             value=config.endpoint
             classNames="form-control"
             placeholder=(t 'loggingPage.syslog.endpointPlaceholder')
+            id="syslog-endpoint"
         }}
         <div class="input-group-btn bg-primary">
           <button
@@ -53,4 +54,4 @@
   </div>
 </section>
 
-{{logging/form-log-format logPreview=logPreview model=model}}
\ No newline at end of file
+{{logging/form-log-format logPreview=logPreview model=model}}
diff --git a/lib/logging/translations/en-us.yaml b/lib/logging/translations/en-us.yaml
index b5dd4af0b..3ed2061f4 100644
--- a/lib/logging/translations/en-us.yaml
+++ b/lib/logging/translations/en-us.yaml
@@ -21,7 +21,7 @@ loggingPage:
   clusterHeader: Cluster Logging
   projectHeader: Project Logging
   helpText:
-    cluster: We will collect the standard output and standard error for each container, the log files which under path<code> /var/log/containers/ </code>on each host. The log will be shipped to the target you choose below.
+    cluster: We will collect the standard output and standard error for each container, the log files which under path <code >/var/log/containers/</code> on each host. The log will be shipped to the target you choose below.
     clusterTarget: The cluster logging target is <code class="text-capitalize">{clusterTargetType}</code>. If project logging is enabled, logs will be shipped to both cluster target and project logging target.
     noClusterTarget: Logging is disabled at current cluster.
   tags: