diff --git a/src/main/java/cn/devezhao/rebuild/web/entitymanage/MetaEntityControll.java b/src/main/java/cn/devezhao/rebuild/web/entitymanage/MetaEntityControll.java
index ba806c83d..12e647dd3 100644
--- a/src/main/java/cn/devezhao/rebuild/web/entitymanage/MetaEntityControll.java
+++ b/src/main/java/cn/devezhao/rebuild/web/entitymanage/MetaEntityControll.java
@@ -89,11 +89,13 @@ public class MetaEntityControll extends BaseControll {
 		String label = getParameterNotNull(request, "label");
 		String comments = getParameter(request, "comments");
 		
-		String entityName = new Entity2Schema(user).create(label, comments);
-		if (entityName != null) {
+		String entityName = null;
+		try {
+			entityName = new Entity2Schema(user).create(label, comments);
 			writeSuccess(response, entityName);
-		} else {
-			writeFailure(response);
+		} catch (Exception ex) {
+			writeFailure(response, ex.getLocalizedMessage());
+			return;
 		}
 	}
 	
diff --git a/src/main/webapp/admin/entity/entity-edit.jsp b/src/main/webapp/admin/entity/entity-edit.jsp
index 56a543d57..b8134c4ca 100644
--- a/src/main/webapp/admin/entity/entity-edit.jsp
+++ b/src/main/webapp/admin/entity/entity-edit.jsp
@@ -32,7 +32,7 @@ a#entityIcon:hover{opacity:0.8}
 						<ul class="nav">
 							<li class="active"><a href="base"><i class="icon mdi mdi-inbox"></i>基本信息</a></li>
 							<li><a href="fields"><i class="icon mdi mdi-inbox"></i>管理字段</a></li>
-							<li><a href="form-design"><i class="icon mdi mdi-inbox"></i>表单布局</a></li>
+							<li><a href="form-design"><i class="icon mdi mdi-inbox"></i>配置布局</a></li>
 						</ul>
 					</div>
 				</div>
diff --git a/src/main/webapp/admin/entity/entity-new.jsp b/src/main/webapp/admin/entity/entity-new.jsp
index 331987184..16a90e376 100644
--- a/src/main/webapp/admin/entity/entity-new.jsp
+++ b/src/main/webapp/admin/entity/entity-new.jsp
@@ -9,7 +9,7 @@
 <div class="main-content">
 	<form>
 		<div class="form-group row">
-			<label class="col-12 col-sm-3 col-form-label text-sm-right">名称</label>
+			<label class="col-12 col-sm-3 col-form-label text-sm-right">实体名称</label>
 			<div class="col-12 col-sm-8 col-lg-4">
 				<input class="form-control form-control-sm" type="text" id="entityLabel" maxlength="40">
 			</div>
@@ -35,15 +35,15 @@ $(document).ready(function(){
 		let entityLabel = $val('#entityLabel'),
 			comments = $val('#comments');
 		if (!entityLabel){
-			alert('请输入名称'); return;
+			rb.notice('请输入实体名称'); return;
 		}
 		
 		btn.button('loading');
 		$.post('entity-new', { label:entityLabel, comments:comments }, function(res){
 			if (res.error_code == 0) parent.location.href = res.data + '/base';
 			else{
-				alert(res);
-				btn.button('reset');
+				rb.notice(res.error_msg)
+				btn.button('reset')
 			}
 		});
 	});
diff --git a/src/main/webapp/admin/entity/field-edit.jsp b/src/main/webapp/admin/entity/field-edit.jsp
index 3c07ecd37..823a4d01f 100644
--- a/src/main/webapp/admin/entity/field-edit.jsp
+++ b/src/main/webapp/admin/entity/field-edit.jsp
@@ -28,7 +28,7 @@
 						<ul class="nav">
 							<li><a href="../base"><i class="icon mdi mdi-inbox"></i>基本信息</a></li>
 							<li class="active"><a href="../fields"><i class="icon mdi mdi-inbox"></i>管理字段</a></li>
-							<li><a href="../layouts"><i class="icon mdi mdi-inbox"></i>管理布局</a></li>
+							<li><a href="../form-design"><i class="icon mdi mdi-inbox"></i>配置布局</a></li>
 						</ul>
 					</div>
 				</div>
diff --git a/src/main/webapp/admin/entity/field-new.jsp b/src/main/webapp/admin/entity/field-new.jsp
index f3469a01e..b3663a882 100644
--- a/src/main/webapp/admin/entity/field-new.jsp
+++ b/src/main/webapp/admin/entity/field-new.jsp
@@ -67,10 +67,10 @@ $(document).ready(function(){
 			comments = $val('#comments'),
 			refEntity = $val('#refEntity');
 		if (!fieldLabel){
-			alert('请输入字段名称'); return;
+			rb.notice('请输入字段名称'); return;
 		}
 		if (type == 'REFERENCE' && !refEntity){
-			alert('请选择引用实体'); return;
+			rb.notice('请选择引用实体'); return;
 		}
 		
 		let _data = { entity:entity, label:fieldLabel, type:type, comments:comments, refEntity:refEntity };
@@ -79,7 +79,7 @@ $(document).ready(function(){
 			if (res.error_code == 0) parent.location.href = entity + '/field/' + res.data;
 			else{
 				rb.notice(res.error_msg)
-				btn.button('reset');
+				btn.button('reset')
 			}
 		});
 	});
diff --git a/src/main/webapp/admin/entity/fields.jsp b/src/main/webapp/admin/entity/fields.jsp
index 60c480526..881d92542 100644
--- a/src/main/webapp/admin/entity/fields.jsp
+++ b/src/main/webapp/admin/entity/fields.jsp
@@ -27,7 +27,7 @@
 						<ul class="nav">
 							<li><a href="base"><i class="icon mdi mdi-inbox"></i>基本信息</a></li>
 							<li class="active"><a href="fields"><i class="icon mdi mdi-inbox"></i>管理字段</a></li>
-							<li><a href="form-design"><i class="icon mdi mdi-inbox"></i>表单布局</a></li>
+							<li><a href="form-design"><i class="icon mdi mdi-inbox"></i>配置布局</a></li>
 						</ul>
 					</div>
 				</div>
diff --git a/src/main/webapp/admin/entity/form-design.jsp b/src/main/webapp/admin/entity/form-design.jsp
index 9d06218db..2ec5b7c40 100644
--- a/src/main/webapp/admin/entity/form-design.jsp
+++ b/src/main/webapp/admin/entity/form-design.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
 <%@ include file="/_include/Head.jsp"%>
-<title>布局管理</title>
+<title>配置布局</title>
 <style type="text/css">
 .form-preview{max-width:630px;margin:0 auto;border:1px solid #4285f4;min-height:100px;padding:20px}
 .sortable-placeholder{border:1px dotted #dedede;height:36px;}
@@ -31,7 +31,7 @@
 						<ul class="nav">
 							<li><a href="base"><i class="icon mdi mdi-inbox"></i>基本信息</a></li>
 							<li><a href="fields"><i class="icon mdi mdi-inbox"></i>管理字段</a></li>
-							<li class="active"><a href="form-design"><i class="icon mdi mdi-inbox"></i>表单布局</a></li>
+							<li class="active"><a href="form-design"><i class="icon mdi mdi-inbox"></i>配置布局</a></li>
 						</ul>
 					</div>
 				</div>
diff --git a/src/main/webapp/assets/js/rb-forms.jsx b/src/main/webapp/assets/js/rb-forms.jsx
index 70a82ec0a..7de87d52d 100644
--- a/src/main/webapp/assets/js/rb-forms.jsx
+++ b/src/main/webapp/assets/js/rb-forms.jsx
@@ -15,7 +15,7 @@ class RbFormModal extends React.Component {
                     <div className="modal-content">
                         <div className="modal-header modal-header-colored">
                             <h3 className="modal-title">{this.state.title || 'TITLE'}</h3>
-                            <a className="close md-close admin-settings admin-visibility" href={rb.baseUrl + '/admin/entity/' + this.props.entity + '/base'} title="实体配置"><span className="zmdi zmdi-settings"></span></a>
+                            <a className="close md-close admin-settings admin-visibility" href={rb.baseUrl + '/admin/entity/' + this.props.entity + '/base'} title="实体配置" target="_blank"><span className="zmdi zmdi-settings"></span></a>
                             <button className="close md-close" type="button" onClick={()=>this.hide()}><span className="zmdi zmdi-close"></span></button>
                         </div>
                         <div className={'modal-body rb-loading' + (this.state.inLoad ? ' rb-loading-active' : '')}>