diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 60684e7066..e1331b310c 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -3253,7 +3253,7 @@ runners.labels = Labels
 runners.latest_online = Last Online Time
 runners.agent_labels = Agent Labels
 runners.custom_labels = Custom Labels
-runners.custom_labels_helper = Custom labels are labels that are not automatically added by the agent. They are added by the administrator. Use comma separated.
+runners.custom_labels_helper = Custom labels are labels that are added manually by an administrator. A comma separates labels, whitespace at the start and end of each label are ignored.
 runners.runner_title = Runner
 runners.task_list = Recent jobs on this runner
 runners.edit_runner = Edit Runner
diff --git a/routers/web/shared/actions/runners.go b/routers/web/shared/actions/runners.go
index 6f6f518ba4..a12a3a5ab2 100644
--- a/routers/web/shared/actions/runners.go
+++ b/routers/web/shared/actions/runners.go
@@ -125,7 +125,7 @@ func RunnerDetailsEditPost(ctx *context.Context, runnerID, ownerID, repoID int64
 	}
 	if !runner.Editable(ownerID, repoID) {
 		err = errors.New("no permission to edit this runner")
-		ctx.NotFound("RunnerDetailsEditPost.Editable", err)
+		ctx.NotFound("RunnerDetailsEditPost.Editable", util.NewPermissionDeniedErrorf("no permission to edit this runner"))
 		return
 	}
 
diff --git a/services/repository/repository.go b/services/repository/repository.go
index 4afdf3310d..4872e3ef7b 100644
--- a/services/repository/repository.go
+++ b/services/repository/repository.go
@@ -54,7 +54,7 @@ func DeleteRepository(ctx context.Context, doer *user_model.User, repo *repo_mod
 
 	// deletes actions resource after the repo has been deleted, to avoid new tasks
 	if err := actions_service.DeleteResourceOfRepository(ctx, repo); err != nil {
-		log.Error("delete actions resource failed: %v", err)
+		return fmt.Errorf("delete actions resources failed: %w", err)
 	}
 
 	return packages_model.UnlinkRepositoryFromAllPackages(ctx, repo.ID)
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index 1f8928db1f..5b7b9ec5f8 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -438,9 +438,9 @@
 					<div class="inline field">
 						<label>{{.locale.Tr "actions.actions"}}</label>
 						{{if .UnitTypeActions.UnitGlobalDisabled}}
-						<div class="ui checkbox tooltip disabled" data-content="{{.locale.Tr "repo.unit_disabled"}}">
+							<div class="ui checkbox tooltip disabled" data-content="{{.locale.Tr "repo.unit_disabled"}}">
 						{{else}}
-						<div class="ui checkbox">
+							<div class="ui checkbox">
 						{{end}}
 							<input class="enable-system" name="enable_actions" type="checkbox" {{if $isActionsEnabled}}checked{{end}}>
 							<label>{{.locale.Tr "repo.settings.actions_desc"}}</label>
diff --git a/templates/repo/settings/runner_edit.tmpl b/templates/repo/settings/runner_edit.tmpl
index 8814ffb0c8..f23573b8be 100644
--- a/templates/repo/settings/runner_edit.tmpl
+++ b/templates/repo/settings/runner_edit.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository settings webhooks">
+<div class="page-content repository settings runners">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/runners.tmpl b/templates/repo/settings/runners.tmpl
index b243f75918..345b934b02 100644
--- a/templates/repo/settings/runners.tmpl
+++ b/templates/repo/settings/runners.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository settings webhooks">
+<div class="page-content repository settings runners">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/runners/edit.tmpl b/templates/runners/edit.tmpl
index 88bf642f9a..995e5bdc33 100644
--- a/templates/runners/edit.tmpl
+++ b/templates/runners/edit.tmpl
@@ -8,15 +8,15 @@
 			{{template "base/disable_form_autofill"}}
 			{{.CsrfTokenHtml}}
 			<div class="runner-basic-info">
-				<div class="field dib">
+				<div class="field dib disabled">
 					<label>{{.locale.Tr "actions.runners.status"}}</label>
 					<span class="runner-status-{{if .Runner.IsOnline}}online{{else}}offline{{end}}">{{.Runner.StatusName}}</span>
 				</div>
-				<div class="field dib">
+				<div class="field dib disabled">
 					<label>{{.locale.Tr "actions.runners.latest_online"}}</label>
 					<span>{{TimeSinceUnix .Runner.LastOnline $.locale}}</span>
 				</div>
-				<div class="field dib">
+				<div class="field dib disabled">
 					<label>{{.locale.Tr "actions.runners.agent_labels"}}</label>
 					<span>
 						{{range .Runner.AgentLabels}}
@@ -24,7 +24,7 @@
 						{{end}}
 					</span>
 				</div>
-				<div class="field dib">
+				<div class="field dib disabled">
 					<label>{{.locale.Tr "actions.runners.owner_type"}}</label>
 					<span>{{.Runner.OwnType}}</span>
 				</div>
@@ -36,7 +36,7 @@
 				<label for="description">{{.locale.Tr "actions.runners.description"}}</label>
 				<input id="description" name="description" value="{{.Runner.Description}}">
 			</div>
-			<div class="field">
+			<div class="field tooltip" data-content="Labels are comma-separated. Whitespace at the beginning, end, and around the commas are ignored.">
 				<label for="custom_labels">{{.locale.Tr "actions.runners.custom_labels"}}</label>
 				<input id="custom_labels" name="custom_labels" value="{{Join .Runner.CustomLabels `,`}}">
 				<p class="help">{{.locale.Tr "actions.runners.custom_labels_helper"}}</p>
diff --git a/templates/runners/list.tmpl b/templates/runners/list.tmpl
index 82b1e76e23..365b8f278f 100644
--- a/templates/runners/list.tmpl
+++ b/templates/runners/list.tmpl
@@ -46,9 +46,7 @@
 			<thead>
 				<tr>
 					<th data-sortt-asc="online" data-sortt-desc="offline">{{.locale.Tr "actions.runners.status"}}</th>
-					<th data-sortt-asc="alphabetically">
-						{{.locale.Tr "actions.runners.id"}}
-					</th>
+					<th data-sortt-asc="alphabetically">{{.locale.Tr "actions.runners.id"}}</th>
 					<th>{{.locale.Tr "actions.runners.owner_type"}}</th>
 					<th>{{.locale.Tr "actions.runners.labels"}}</th>
 					<th>{{.locale.Tr "actions.runners.latest_online"}}</th>
diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue
index e690de1e6c..448c80de47 100644
--- a/web_src/js/components/RepoActionView.vue
+++ b/web_src/js/components/RepoActionView.vue
@@ -8,9 +8,6 @@
     <div class="action-view-body">
       <div class="action-view-left">
         <div class="job-group-section" v-for="(jobGroup, i) in allJobGroups" :key="i">
-          <!--        <div class="job-group-summary">-->
-          <!--          {{ jobGroup.summary }}-->
-          <!--        </div>-->
           <div class="job-brief-list">
             <a class="job-brief-item" v-for="(job, index) in jobGroup.jobs" :key="job.id" :href="runInfo.htmlurl+'/jobs/'+index">
               <SvgIcon name="octicon-check-circle-fill" class="green" v-if="job.status === 'success'"/>
@@ -59,17 +56,6 @@
 
             <!-- the log elements could be a lot, do not use v-if to destroy/reconstruct the DOM -->
             <div class="job-step-logs" ref="elJobStepLogs" v-show="currentJobStepsStates[i].expanded">
-              <!--
-              possible layouts:
-              <div class="job-log-group">
-                <div class="job-log-group-summary"></div>
-                <div class="job-log-list">
-                  <div class="job-log-line"></div>
-                </div>
-              </div>
-              -- or --
-              <div class="job-log-line"></div>
-              -->
             </div>
           </div>
         </div>
@@ -312,9 +298,6 @@ const sfc = {
         const reqData = {stepLogCursors};
 
         const respData = await this.fetchJobData(reqData);
-        // const respData = this.fetchMockData(reqData);
-
-        // console.log('loadJobData by request', reqData, ', get response ', respData);
 
         // save the stateData to Vue data, then the UI will be updated
         for (const [key, value] of Object.entries(respData.stateData)) {