diff --git a/lib/zin/wg/backbtn/v1.php b/lib/zin/wg/backbtn/v1.php
index ed1279003a..13f1f4840b 100644
--- a/lib/zin/wg/backbtn/v1.php
+++ b/lib/zin/wg/backbtn/v1.php
@@ -63,7 +63,7 @@ class backBtn extends btn
             'store'          => 'store-browse',
             'space'          => 'space-browse',
             'serverroom'     => 'serverroom-browse',
-            'gitlab'         => 'gitlab-browseproject'
+            'gitlab'         => 'space-browse,gitlab-browseproject'
         );
 
         $props = parent::getProps();
diff --git a/module/gitlab/ui/browsebranch.html.php b/module/gitlab/ui/browsebranch.html.php
index 6508ae9aba..3b19080b05 100644
--- a/module/gitlab/ui/browsebranch.html.php
+++ b/module/gitlab/ui/browsebranch.html.php
@@ -10,24 +10,16 @@ declare(strict_types=1);
  */
 namespace zin;
 
-featureBar
+detailHeader
 (
-    backBtn
+    common::hasPriv('instance', 'manage') ? to::suffix(btn
     (
-        set::text($lang->goback),
-        set::url(createLink('gitlab', 'browseProject', "gitlabID={$gitlabID}"))
-    )
-);
-hasPriv('instance', 'manage') ? toolBar
-(
-    item
-    (
-        setClass('btn primary'),
-        set::text($lang->gitlab->createBranch),
         set::icon('plus'),
-        set::url(createLink('gitlab', 'createBranch', "gitlabID={$gitlabID}&projectID={$projectID}"))
-    )
-) : null;
+        set::url(createLink('gitlab', 'createBranch', "gitlabID={$gitlabID}&projectID={$projectID}")),
+        set::type('primary'),
+        $lang->gitlab->createTag
+    )) : null
+);
 
 $branchList = initTableData($gitlabBranchList, $config->gitlab->dtable->branch->fieldList, $this->gitlab);
 dtable
diff --git a/module/gitlab/ui/browsetag.html.php b/module/gitlab/ui/browsetag.html.php
index 6426174668..943997a858 100644
--- a/module/gitlab/ui/browsetag.html.php
+++ b/module/gitlab/ui/browsetag.html.php
@@ -17,45 +17,44 @@ if(!empty($permissionError))
     return;
 }
 
-featureBar
+detailHeader
 (
-    backBtn
+    to::title
     (
-        set::text($lang->goback),
-        set::url(createLink('gitlab', 'browseProject', "gitlabID={$gitlabID}"))
-    ),
-    form
-    (
-        setID('searchForm'),
-        setClass('ml-4'),
-        set::actions(array()),
-        formRow
+        entityLabel
         (
-            input
+            span($project->name_with_namespace)
+        ),
+        form
+        (
+            setID('searchForm'),
+            setClass('ml-4'),
+            set::actions(array()),
+            formRow
             (
-                set::placeholder($lang->gitlab->tag->placeholderSearch),
-                set::name('keyword'),
-                set::value($keyword)
-            ),
-            btn
-            (
-                setClass('primary'),
-                $lang->gitlab->search,
-                on::click('search')
+                input
+                (
+                    set::placeholder($lang->gitlab->tag->placeholderSearch),
+                    set::name('keyword'),
+                    set::value($keyword)
+                ),
+                btn
+                (
+                    setClass('primary'),
+                    $lang->gitlab->search,
+                    on::click('search')
+                )
             )
         )
-    )
-);
-hasPriv('instance', 'manage') ? toolBar
-(
-    item
+    ),
+    common::hasPriv('instance', 'manage') ? to::suffix(btn
     (
-        setClass('btn primary'),
-        set::text($lang->gitlab->createTag),
         set::icon('plus'),
-        set::url(createLink('gitlab', 'createTag', "gitlabID={$gitlabID}&projectID={$projectID}"))
-    )
-) : null;
+        set::url(createLink('gitlab', 'createTag', "gitlabID={$gitlabID}&projectID={$projectID}")),
+        set::type('primary'),
+        $lang->gitlab->createTag
+    )) : null
+);
 
 $tagList = initTableData($gitlabTagList, $config->gitlab->dtable->tag->fieldList, $this->gitlab);
 dtable
diff --git a/module/gitlab/ui/importissue.html.php b/module/gitlab/ui/importissue.html.php
index f95ca025f3..615d227bb4 100644
--- a/module/gitlab/ui/importissue.html.php
+++ b/module/gitlab/ui/importissue.html.php
@@ -10,6 +10,8 @@ declare(strict_types=1);
  */
 namespace zin;
 
+use backup;
+
 $items = array();
 $items[] = array('name' => 'title', 'label' => $lang->gitlab->gitlabIssue, 'control' => 'static');
 $items[] = array('name' => 'objectTypeList', 'label' => $lang->gitlab->objectType, 'control' => 'picker', 'items' => $objectTypes);
@@ -29,33 +31,36 @@ if(empty($gitlabIssues))
         setClass('panel-form'),
         set::size('lg'),
         set::title($lang->gitlab->importIssue),
+        set::headingActions(array(array(
+            'url'  => createLink('gitlab', 'browseProject', "gitlabID={$gitlabID}"),
+            'type' => 'primary',
+            'icon' => 'back',
+            'text' => $lang->goback
+        ))),
         $lang->gitlab->noImportableIssues
     );
 }
 else
 {
-formBatchPanel
-(
-    h::input
+    formBatchPanel
     (
-        set::type('hidden'),
-        set::name('gitlabID'),
-        set::value($gitlabID)
-    ),
-    h::input
-    (
-        set::type('hidden'),
-        set::name('gitlabProjectID'),
-        set::value($gitlabProjectID)
-    ),
-    set::title($lang->gitlab->importIssue),
-    set::mode('edit'),
-    set::items($items),
-    set::data($gitlabIssues),
-    set::onRenderRowCol(jsRaw('window.renderRowCol')),
-    on::change('[data-name="productList"]', 'loadProductExecutions')
-);
+        h::input
+        (
+            set::type('hidden'),
+            set::name('gitlabID'),
+            set::value($gitlabID)
+        ),
+        h::input
+        (
+            set::type('hidden'),
+            set::name('gitlabProjectID'),
+            set::value($gitlabProjectID)
+        ),
+        set::title($lang->gitlab->importIssue),
+        set::mode('edit'),
+        set::items($items),
+        set::data($gitlabIssues),
+        set::onRenderRowCol(jsRaw('window.renderRowCol')),
+        on::change('[data-name="productList"]', 'loadProductExecutions')
+    );
 }
-
-render();
-