diff --git a/module/instance/control.php b/module/instance/control.php
index 71c2695ba8..ede9332594 100644
--- a/module/instance/control.php
+++ b/module/instance/control.php
@@ -726,6 +726,7 @@ class instance extends control
         $instance = $this->instance->getByID($id);
 
         $this->view->instance = $instance;
+        $this->view->title    = $this->lang->instance->log->viewButton;
         $this->display();
     }
 
diff --git a/module/instance/js/events.ui.js b/module/instance/js/events.ui.js
index 0ad7ebb93a..2e281ce609 100644
--- a/module/instance/js/events.ui.js
+++ b/module/instance/js/events.ui.js
@@ -8,22 +8,29 @@ window.initComponent = function (instanceID)
     {
         toggleLoading('#events-panel', false);
         $picker.render({items: items});
-        if (typeof (items) !== 'undefined')
-        {
-            $picker.$.setValue(items.component);
-        }
+        if (typeof (items) !== 'undefined') $picker.$.setValue(items.component);
+        if (items.length === 1) $('#component-events').addClass('hidden');
         showEvents(instanceID);
     });
 };
 
-window.showEvents = function (instanceID)
+
+window.showEvents = function (instanceID,noEventTip)
 {
     const instanceComponent = $('[name=component]').val();
     const target = $.createLink('instance', 'showEvents', 'id=' + instanceID + "&component=" + instanceComponent);
     toggleLoading('#events-panel', true);
-    $.getJSON(target, function (data)
+    $.getJSON(target, function (resp)
     {
         toggleLoading('#events-panel', false);
-        $('#events-content').html(data.data.map(item => item.lastSeen + ' ' + item.type + ' ' + item.reason + ' ' + item.object + ' ' + item.message).join('\n'));
+        $('#events-content').removeClass('dtable-empty-tip flex');
+        if (resp.data.length === 0)
+        {
+            $('#events-content').html(noEventTip);
+            $('#events-content').addClass('dtable-empty-tip flex');
+            return;
+        }
+       $('#events-content').html(resp.data.map(item => item.lastSeen + ' ' + item.type + ' ' + item.reason + ' ' + item.object + ' ' + item.message).join('\n'));
+       $('#events-content')[0].scrollTop = $('#events-content')[0].scrollHeight;
     });
 };
diff --git a/module/instance/lang/de.php b/module/instance/lang/de.php
index 85701ed0a4..a84677b271 100644
--- a/module/instance/lang/de.php
+++ b/module/instance/lang/de.php
@@ -187,20 +187,24 @@ $lang->instance->log = new stdclass;
 $lang->instance->log->date    = 'date';
 $lang->instance->log->message = 'Content';
 
-$lang->instance->log->viewButton = 'Logs';
-$lang->instance->log->title      = 'Watch Logs';
-$lang->instance->log->button     = 'View Now';
+$lang->instance->log->viewButton  = 'Logs';
+$lang->instance->log->title       = 'Watch Logs';
+$lang->instance->log->button      = 'View Now';
+$lang->instance->log->autoRefresh = 'Switch refresh status';
+$lang->instance->log->tips        = 'The logs are refreshed automatically by default, and you can switch the button to switch';
+$lang->instance->log->noLog       = 'No logs yet';
+
 
 $lang->instance->component         = 'Component';
 $lang->instance->pod               = 'Pod';
-$lang->instance->isPrevious        = 'Is Previous container';
-$lang->instance->isPreviousList[0] = 'No';
-$lang->instance->isPreviousList[1] = 'Yes';
+$lang->instance->isPreviousList[0] = 'Current container';
+$lang->instance->isPreviousList[1] = 'Previous container';
 
 $lang->instance->event = new stdClass;
 $lang->instance->event->viewButton = 'Events';
 $lang->instance->event->title      = 'Watch Events';
 $lang->instance->event->button     = 'View Now';
+$lang->instance->event->noEvents   = 'No events yet';
 
 $lang->instance->actionList  =  array();
 $lang->instance->actionList['install']                  = '%s installed';
diff --git a/module/instance/lang/en.php b/module/instance/lang/en.php
index 85701ed0a4..a84677b271 100644
--- a/module/instance/lang/en.php
+++ b/module/instance/lang/en.php
@@ -187,20 +187,24 @@ $lang->instance->log = new stdclass;
 $lang->instance->log->date    = 'date';
 $lang->instance->log->message = 'Content';
 
-$lang->instance->log->viewButton = 'Logs';
-$lang->instance->log->title      = 'Watch Logs';
-$lang->instance->log->button     = 'View Now';
+$lang->instance->log->viewButton  = 'Logs';
+$lang->instance->log->title       = 'Watch Logs';
+$lang->instance->log->button      = 'View Now';
+$lang->instance->log->autoRefresh = 'Switch refresh status';
+$lang->instance->log->tips        = 'The logs are refreshed automatically by default, and you can switch the button to switch';
+$lang->instance->log->noLog       = 'No logs yet';
+
 
 $lang->instance->component         = 'Component';
 $lang->instance->pod               = 'Pod';
-$lang->instance->isPrevious        = 'Is Previous container';
-$lang->instance->isPreviousList[0] = 'No';
-$lang->instance->isPreviousList[1] = 'Yes';
+$lang->instance->isPreviousList[0] = 'Current container';
+$lang->instance->isPreviousList[1] = 'Previous container';
 
 $lang->instance->event = new stdClass;
 $lang->instance->event->viewButton = 'Events';
 $lang->instance->event->title      = 'Watch Events';
 $lang->instance->event->button     = 'View Now';
+$lang->instance->event->noEvents   = 'No events yet';
 
 $lang->instance->actionList  =  array();
 $lang->instance->actionList['install']                  = '%s installed';
diff --git a/module/instance/lang/fr.php b/module/instance/lang/fr.php
index 85701ed0a4..a84677b271 100644
--- a/module/instance/lang/fr.php
+++ b/module/instance/lang/fr.php
@@ -187,20 +187,24 @@ $lang->instance->log = new stdclass;
 $lang->instance->log->date    = 'date';
 $lang->instance->log->message = 'Content';
 
-$lang->instance->log->viewButton = 'Logs';
-$lang->instance->log->title      = 'Watch Logs';
-$lang->instance->log->button     = 'View Now';
+$lang->instance->log->viewButton  = 'Logs';
+$lang->instance->log->title       = 'Watch Logs';
+$lang->instance->log->button      = 'View Now';
+$lang->instance->log->autoRefresh = 'Switch refresh status';
+$lang->instance->log->tips        = 'The logs are refreshed automatically by default, and you can switch the button to switch';
+$lang->instance->log->noLog       = 'No logs yet';
+
 
 $lang->instance->component         = 'Component';
 $lang->instance->pod               = 'Pod';
-$lang->instance->isPrevious        = 'Is Previous container';
-$lang->instance->isPreviousList[0] = 'No';
-$lang->instance->isPreviousList[1] = 'Yes';
+$lang->instance->isPreviousList[0] = 'Current container';
+$lang->instance->isPreviousList[1] = 'Previous container';
 
 $lang->instance->event = new stdClass;
 $lang->instance->event->viewButton = 'Events';
 $lang->instance->event->title      = 'Watch Events';
 $lang->instance->event->button     = 'View Now';
+$lang->instance->event->noEvents   = 'No events yet';
 
 $lang->instance->actionList  =  array();
 $lang->instance->actionList['install']                  = '%s installed';
diff --git a/module/instance/ui/events.html.php b/module/instance/ui/events.html.php
index afd7181ff0..fbec9235e8 100644
--- a/module/instance/ui/events.html.php
+++ b/module/instance/ui/events.html.php
@@ -15,52 +15,40 @@ namespace zin;
 formPanel
 (
     set::title($lang->instance->event->title),
-    set::actions(array(
-        array(
-            'text'    => $lang->instance->event->button,
-            'type'    => 'primary',
-            'onclick' => 'window.showEvents('.$instance->id.')',
-        )
-    )),
+    set::actions(false),
     setID('events-panel'),
     setClass('w-full'),
-    formRow
+    inputGroup
     (
-        formGroup
+        input
         (
+            setClass('hidden'),
             set::name('name'),
-            set::labelWidth('160px'),
             set::required(true),
             set::label($lang->instance->name),
             set::value($instance->name),
-            set::disabled(true),
-        )
-    ),
-    formRow
-    (
-        formGroup
+            set::inline(true),
+        ),
+        inputGroup
         (
             setID('component-events'),
-            set::name('component'),
-            set::labelWidth('160px'),
-            set::control('picker'),
-            set::required(true),
-            set::label($lang->instance->component),
-            on::inited()->call('initComponent', $instance->id),
-            on::change()->call('showEvents', $instance->id)
+            $lang->instance->component,
+            picker
+            (
+                set::name('component'),
+                set::control('picker'),
+                set::required(true),
+                set::label($lang->instance->component),
+                set::inline(true),
+                on::inited()->call('initComponent', $instance->id),
+                on::change()->call('showEvents', $instance->id,$lang->instance->event->noEvents)
+            )
         )
     ),
     div
     (
-        setClass('px-1 mt-2 w-full'),
-        panel
-        (
-            setClass('py-2'),
-            form
-            (
-                h::pre(setID('events-content'), setClass('bg-gray-800 text-white progress block h-96')),
-                set::actions(false)
-            )
-        )
+        setClass('w-full'),
+        h::pre(setID('events-content'), setClass('bg-gray-800 text-white block h-96 scrollbar-thin')),
+        set::actions(false)
     )
 );
\ No newline at end of file