diff --git a/server-core/src/main/java/io/onedev/server/ci/job/retry/JobRetry.java b/server-core/src/main/java/io/onedev/server/ci/job/retry/JobRetry.java
index 716e0a27b5..3cf247ebf7 100644
--- a/server-core/src/main/java/io/onedev/server/ci/job/retry/JobRetry.java
+++ b/server-core/src/main/java/io/onedev/server/ci/job/retry/JobRetry.java
@@ -5,9 +5,11 @@ import java.io.Serializable;
 import org.hibernate.validator.constraints.NotEmpty;
 
 import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.Horizontal;
 import io.onedev.server.web.editable.annotation.RetryCondition;
 
 @Editable
+@Horizontal
 public class JobRetry implements Serializable {
 
 	private static final long serialVersionUID = 1L;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/InputSpecCssResourceReference.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/InputSpecCssResourceReference.java
new file mode 100644
index 0000000000..a3c54b8691
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/InputSpecCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.model.support.inputspec;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class InputSpecCssResourceReference extends BaseDependentCssResourceReference {
+
+	private static final long serialVersionUID = 1L;
+
+	public InputSpecCssResourceReference() {
+		super(InputSpecCssResourceReference.class, "input-spec.css");
+	}
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/input-spec.css b/server-core/src/main/java/io/onedev/server/model/support/inputspec/input-spec.css
new file mode 100644
index 0000000000..5fc9414765
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/input-spec.css
@@ -0,0 +1,23 @@
+.floating.input-spec .property-uuid, .input-spec-edit .property-uuid {
+	display: none;
+}
+.floating.input-spec>.content>.body>div>.bean-viewer>.bean-properties>table>tbody>tr>td.name {
+	min-width: 150px;
+} 
+.floating.input-spec .bean-viewer+.bean-viewer table>tbody>tr:first-child>td {
+    padding-top: 16px;
+}
+
+.floating.input-spec .property-showCondition .property-inputName td.name, 
+.floating.input-spec .property-choicesProvider .property-inputName td.name,
+.floating.input-spec .property-defaultValueProvider .property-inputName td.name {
+	border-right: none;
+	text-align: left;
+}
+
+.input-spec .property-showCondition .property-inputName td.name, 
+.input-spec-edit .property-showCondition .property-inputName label.name, 
+.input-spec-edit .property-choiceProvider>.value label.name,
+.input-spec-edit .property-choiceProvider>.value .bean.list thead th {
+	font-weight: normal;
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java
index 94c0240ac2..fa1e9c22a0 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java
@@ -187,8 +187,6 @@ public class BeanEditor extends ValueEditor<Serializable> {
 				valueContainer.add(descriptionLabel);
 				
 				valueContainer.add(new FencedFeedbackPanel("feedback", propertyEditor));
-				
-				valueContainer.add(AttributeAppender.append("class", "property-" + property.getPropertyName()));
 			}
 
 			@Override
@@ -232,6 +230,8 @@ public class BeanEditor extends ValueEditor<Serializable> {
 			}
 
 		};
+		
+		item.add(AttributeAppender.append("class", "property-" + property.getPropertyName()));
 
 		return item;
 	}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecCssResourceReference.java
deleted file mode 100644
index 2ab97411f3..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.editable.job.paramspec;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class ParamSpecCssResourceReference extends BaseDependentCssResourceReference {
-
-	private static final long serialVersionUID = 1L;
-
-	public ParamSpecCssResourceReference() {
-		super(ParamSpecCssResourceReference.class, "param-spec.css");
-	}
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.html
index a1f6eb9784..dfb079bfcf 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.html
@@ -1,5 +1,5 @@
 <wicket:panel>
-	<form wicket:id="form" class="job-param-spec-edit leave-confirm">
+	<form wicket:id="form" class="param-spec-edit leave-confirm">
 		<div class="modal-header">
 			<button wicket:id="close" type="button" class="close">&times;</button>
 			<h4 id="modal-title" class="modal-title">
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.java
index cb3b29e469..6bfef1402e 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.java
@@ -27,6 +27,7 @@ import org.apache.wicket.model.Model;
 import org.apache.wicket.util.convert.ConversionException;
 
 import io.onedev.server.ci.job.paramspec.ParamSpec;
+import io.onedev.server.model.support.inputspec.InputSpecCssResourceReference;
 import io.onedev.server.web.behavior.sortable.SortBehavior;
 import io.onedev.server.web.behavior.sortable.SortPosition;
 import io.onedev.server.web.component.modal.ModalLink;
@@ -226,7 +227,7 @@ class ParamSpecListEditPanel extends PropertyEditor<List<Serializable>> {
 	@Override
 	public void renderHead(IHeaderResponse response) {
 		super.renderHead(response);
-		response.render(CssHeaderItem.forReference(new ParamSpecCssResourceReference()));
+		response.render(CssHeaderItem.forReference(new InputSpecCssResourceReference()));
 	}
 	
 }
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.java
index ab88bcc892..84869cb534 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.java
@@ -29,6 +29,7 @@ import org.apache.wicket.model.Model;
 import com.google.common.collect.Sets;
 
 import io.onedev.server.ci.job.paramspec.ParamSpec;
+import io.onedev.server.model.support.inputspec.InputSpecCssResourceReference;
 import io.onedev.server.web.editable.BeanContext;
 import io.onedev.server.web.editable.EditableUtils;
 import io.onedev.server.web.page.layout.SideFloating;
@@ -147,7 +148,7 @@ class ParamSpecListViewPanel extends Panel {
 	@Override
 	public void renderHead(IHeaderResponse response) {
 		super.renderHead(response);
-		response.render(CssHeaderItem.forReference(new ParamSpecCssResourceReference()));
+		response.render(CssHeaderItem.forReference(new InputSpecCssResourceReference()));
 	}
 	
 	private abstract class ColumnFragment extends Fragment {
@@ -179,7 +180,7 @@ class ParamSpecListViewPanel extends Panel {
 						@Override
 						protected void onInitialize() {
 							super.onInitialize();
-							add(AttributeAppender.append("class", "job-param-spec def-detail"));
+							add(AttributeAppender.append("class", "param-spec input-spec def-detail"));
 						}
 
 						@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/param-spec.css b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/param-spec.css
deleted file mode 100644
index d1b94befa5..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/param-spec.css
+++ /dev/null
@@ -1,6 +0,0 @@
-.floating.job-param-spec>.content>.body>.bean-viewer>.bean-properties>table>tbody>tr>td.name {
-	min-width: 150px;
-} 
-.floating.job-param-spec .property-uuid, .job-param-spec-edit .property-uuid {
-	display: none;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.html
index 76a12dc065..1a3bf7965e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.html
@@ -1,5 +1,5 @@
 <wicket:panel>
-	<form wicket:id="form" class="field-spec-edit leave-confirm">
+	<form wicket:id="form" class="field-spec-edit input-spec-edit leave-confirm">
 		<div class="modal-header">
 			<button wicket:id="close" type="button" class="close">&times;</button>
 			<h4 id="modal-title" class="modal-title">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java
index 78991c195e..368fbd2acc 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java
@@ -15,6 +15,8 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.panel.Fragment;
 import org.apache.wicket.markup.repeater.Item;
@@ -31,6 +33,7 @@ import com.google.common.collect.Sets;
 import io.onedev.server.OneDev;
 import io.onedev.server.entitymanager.SettingManager;
 import io.onedev.server.model.support.administration.GlobalIssueSetting;
+import io.onedev.server.model.support.inputspec.InputSpecCssResourceReference;
 import io.onedev.server.model.support.issue.fieldspec.FieldSpec;
 import io.onedev.server.web.ajaxlistener.ConfirmListener;
 import io.onedev.server.web.behavior.sortable.SortBehavior;
@@ -215,6 +218,12 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {
 		}.sortable("tbody"));
 	}
 	
+	@Override
+	public void renderHead(IHeaderResponse response) {
+		super.renderHead(response);
+		response.render(CssHeaderItem.forReference(new InputSpecCssResourceReference()));
+	}
+
 	private int getFieldSpecIndex(String fieldName) {
 		for (int i=0; i<getSetting().getFieldSpecs().size(); i++) {
 			if (getSetting().getFieldSpecs().get(i).getName().equals(fieldName))
@@ -255,7 +264,7 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {
 						@Override
 						protected void onInitialize() {
 							super.onInitialize();
-							add(AttributeAppender.append("class", "field-spec def-detail"));
+							add(AttributeAppender.append("class", "field-spec input-spec def-detail"));
 						}
 
 						@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issue-setting.css b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issue-setting.css
index 5859763857..38ef738490 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issue-setting.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issue-setting.css
@@ -1,27 +1,3 @@
-.floating.field-spec>.content>.body>div>.bean-viewer>.bean-properties>table>tbody>tr>td.name {
-	min-width: 150px;
-} 
-.floating.field-spec .bean-viewer+.bean-viewer table>tbody>tr:first-child>td {
-    padding-top: 16px;
-}
-
-.floating.field-spec .property-showCondition .property-inputName td.name, 
-.floating.field-spec .property-choicesProvider .property-inputName td.name,
-.floating.field-spec .property-defaultValueProvider .property-inputName td.name {
-	border-right: none;
-	text-align: left;
-}
-
-.field-spec .property-showCondition .property-inputName td.name, 
-.field-spec-edit .property-showCondition .property-inputName label.name, 
-.field-spec-edit .property-choiceProvider>.value label.name,
-.field-spec-edit .property-choiceProvider>.value .bean.list thead th,
-.field-spec-edit .property-nameOfEmptyValue .control-label {
-	font-weight: normal;
-}
-.floating.field-spec .property-uuid, .field-spec-edit .property-uuid {
-	display: none;
-}
 #issue-setting .issue-states table>tbody>tr>td:first-child a span {
 	border-radius: 3px;
 	padding: 2px 6px;
@@ -36,6 +12,10 @@
 #issue-setting .default-queries th.property-name {
 	width: 30%;
 }
+.field-spec-edit .property-nameOfEmptyValue .control-label {
+	font-weight: normal;
+}
+
 @media(max-width: 991px) {
 	#issue-setting .display-in-issue-list, .field-spec .property-displayInIssueList, 
 	.field-spec-edit .property-displayInIssueList {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css
index 2f645b5f82..895f825cc7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css
@@ -111,3 +111,5 @@
 .ci-spec>.valid .def-list table>tbody>tr>td:first-child>div>a {
     margin-left: 0;
 }
+
+
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js
index 608fcafaa9..d12283d0c6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js
@@ -87,7 +87,7 @@ onedev.server.ciSpec = {
             var $contents = $body.children(".contents");
             var $content = $contents.children().eq(index);
             
-            var $input = $content.find(">div>table>tbody>tr>td.property-name input");
+            var $input = $content.find(">div>table>tbody>tr.property-name>td input");
 
             function syncName() {
                 var name = $input.val().trim();