diff --git a/module/ci/model.php b/module/ci/model.php
index 6cc2f321bf..60695060ac 100644
--- a/module/ci/model.php
+++ b/module/ci/model.php
@@ -125,9 +125,11 @@ class ciModel extends model
      */
     public function syncGitlabTaskStatus($compile)
     {
+        $this->loadModel('gitlab');
+
         $now      = helper::now();
-        $pipeline = $this->loadModel('gitlab')->apiGetSinglePipeline($compile->server, $compile->pipeline, $compile->queue);
-        $jobs     = $this->loadModel('gitlab')->apiGetJobs($compile->server, $compile->pipeline, $compile->queue);
+        $pipeline = $this->apiGetSinglePipeline($compile->server, $compile->pipeline, $compile->queue);
+        $jobs     = $this->apiGetJobs($compile->server, $compile->pipeline, $compile->queue);
 
         $data = new stdclass;
         $data->status     = $pipeline->status;
@@ -136,7 +138,7 @@ class ciModel extends model
         foreach($jobs as $job)
         {
             if(empty($job->duration) or $job->duration == '') $job->duration = '-';
-            $data->logs = "<font style='font-weight:bold'>&gt;&gt;&gt; Job: $job->name, Stage: $job->stage, Status: $job->status, Duration: $job->duration Sec\r\n </font>";
+            $data->logs  = "<font style='font-weight:bold'>&gt;&gt;&gt; Job: $job->name, Stage: $job->stage, Status: $job->status, Duration: $job->duration Sec\r\n </font>";
             $data->logs .= "Job URL: <a href=\"$job->web_url\" target='_blank'>$job->web_url</a> \r\n";
             $data->logs .= $this->transformAnsiToHtml($this->loadModel('gitlab')->apiGetJobLog($compile->server, $compile->pipeline, $job->id));
         }
diff --git a/module/jenkins/view/create.html.php b/module/jenkins/view/create.html.php
index 2ed8341052..725f5bf3a5 100644
--- a/module/jenkins/view/create.html.php
+++ b/module/jenkins/view/create.html.php
@@ -47,7 +47,7 @@
             <th></th>
             <td class='text-center form-actions'>
               <?php echo html::submitButton(); ?>
-              <?php echo html::backButton(); ?>
+              <?php if(!isonlybody()) echo html::a(inlink('browse', ""), $lang->goback, '', 'class="btn btn-wide"');?>
             </td>
           </tr>
         </table>
diff --git a/module/jenkins/view/edit.html.php b/module/jenkins/view/edit.html.php
index 04b26aa7f9..a5a6c98d94 100644
--- a/module/jenkins/view/edit.html.php
+++ b/module/jenkins/view/edit.html.php
@@ -47,7 +47,7 @@
             <th></th>
             <td class='text-center form-actions'>
               <?php echo html::submitButton(); ?>
-              <?php echo html::backButton() ?>
+              <?php if(!isonlybody()) echo html::a(inlink('browse', ""), $lang->goback, '', 'class="btn btn-wide"');?>
             </td>
           </tr>
         </table>
diff --git a/module/job/view/edit.html.php b/module/job/view/edit.html.php
index 4fbc8027e5..4c07feb22e 100644
--- a/module/job/view/edit.html.php
+++ b/module/job/view/edit.html.php
@@ -109,7 +109,7 @@
                 <div class='table-col'><?php echo html::select('jkServer', $jenkinsServerList, $job->server, "class='form-control chosen'");?></div>
                 <div class='table-col'>
                   <div class='input-group'>
-                    <span class='input-group-addon'><?php echo $lang->job->pipeline; ?></span>
+                    <span class='input-group-addon'><?php echo $lang->job->Pipeline; ?></span>
                     <?php echo html::select('jkTask', array('' => ''), $job->pipeline, "class='form-control chosen'");?>
                   </div>
                 </div>
diff --git a/module/repo/view/create.html.php b/module/repo/view/create.html.php
index bce732117e..91f7f1cd0a 100644
--- a/module/repo/view/create.html.php
+++ b/module/repo/view/create.html.php
@@ -101,7 +101,7 @@
             <th></th>
             <td colspan='2' class='text-center form-actions'>
               <?php echo html::submitButton(); ?>
-              <?php echo html::backButton(); ?>
+              <?php if(!isonlybody()) echo html::a(inlink('maintain', ""), $lang->goback, '', 'class="btn btn-wide"');?>
             </td>
           </tr>
         </table>
diff --git a/module/repo/view/setrules.html.php b/module/repo/view/setrules.html.php
index d987d78fac..9e5c399769 100644
--- a/module/repo/view/setrules.html.php
+++ b/module/repo/view/setrules.html.php
@@ -93,7 +93,7 @@
         <tr>
           <td colspan='4' class='text-center'>
             <?php echo html::submitButton();?>
-            <?php echo html::backButton();?>
+            <?php if(!isonlybody()) echo html::a(inlink('browse', ""), $lang->goback, '', 'class="btn btn-wide"');?>
           </td>
         </tr>
       </tbody>