diff --git a/src/backyard/user/Create.vue b/src/backyard/user/Create.vue
index 18a20c6..eab5f30 100644
--- a/src/backyard/user/Create.vue
+++ b/src/backyard/user/Create.vue
@@ -12,7 +12,73 @@
 			</div>
 
 			<div class="col-md-12">
-        这里创建用户
+				<div class="bg-white br4 border p10">
+					<div>
+						<div class="row mt10" v-if="!user.editMode" v-validator="user.validatorSchema.email.error">
+							<label class="col-md-2 control-label mt5 compulsory">邮箱</label>
+							<div class="col-md-10 validate">
+								<input type="text" class="form-control" v-model="user.email">
+							</div>
+						</div>
+
+						<div class="row mt10" v-validator="user.validatorSchema.username.error">
+							<label class="col-md-2 control-label mt5 compulsory">用户名</label>
+							<div class="col-md-10 validate">
+								<input type="text" class="form-control" v-model="user.username">
+							</div>
+						</div>
+
+						<div class="row mt10" v-if="!user.editMode" v-validator="user.validatorSchema.password.error">
+							<label class="col-md-2 control-label mt5 compulsory">密码</label>
+							<div class="col-md-10 validate">
+								<input type="password" class="form-control" v-model="user.password">
+							</div>
+						</div>
+
+						<div class="row mt10" v-if="!user.editMode">
+							<label class="col-md-2 control-label mt5 compulsory">确认密码</label>
+							<div class="col-md-10">
+								<input type="password" class="form-control" v-model="rePassword">
+							</div>
+						</div>
+
+						<div class="row mt10">
+							<label class="col-md-2 control-label mt5">手机号</label>
+							<div class="col-md-10">
+								<input type="text" class="form-control" v-model="user.phone">
+							</div>
+						</div>
+
+						<div class="row mt10">
+							<label class="col-md-2 control-label mt5">性别</label>
+							<div class="col-md-10">
+
+            <span v-for="gender in user.getGenderList()" class="mr10">
+              <NbRadio v-model="user.gender" :val="gender.value" name="gender"></NbRadio>
+              <label>{{gender.name}}</label>
+            </span>
+
+							</div>
+						</div>
+
+						<div class="row mt10">
+							<label class="col-md-2 control-label mt5">城市</label>
+							<div class="col-md-10">
+								<input type="text" class="form-control" v-model="user.city">
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+
+			<div class="col-md-12">
+				<div class="mt10">
+					<button class="btn btn-sm btn-primary" @click.stop.prevent="$router.go(-1)">
+						<span class="fa fa-reply"></span>
+						返回
+					</button>
+					<CreateSaveButton :entity="user" :callback="save"></CreateSaveButton>
+				</div>
 			</div>
 
 		</div>
diff --git a/src/backyard/user/Detail.vue b/src/backyard/user/Detail.vue
index 53d9ec5..991374a 100644
--- a/src/backyard/user/Detail.vue
+++ b/src/backyard/user/Detail.vue
@@ -86,26 +86,26 @@
 											</span>
                   </div>
                   <div class="col-md-12 text-right">
-                    <el-button size="medium" class="mb5" v-if="currentUser.uuid !== user.uuid"
+                    <button class="btn btn-sm btn-primary mb5" v-if="currentUser.uuid !== user.uuid"
                                @click.stop.prevent="$router.push('/user/profile')">
                       返回管理员账户
-                    </el-button>
-                    <el-button size="medium" class="mb5" v-if="user.role === 'ADMINISTRATOR'"
+                    </button>
+                    <button class="btn btn-sm btn-primary mb5" v-if="user.role === 'ADMINISTRATOR'"
                                @click.stop.prevent="resetPassword">
                       重置密码
-                    </el-button>
-                    <el-button size="medium" class="mb5" v-if="currentUser.uuid === user.uuid"
+                    </button>
+                    <button class="btn btn-sm btn-primary mb5" v-if="currentUser.uuid === user.uuid"
                                @click.stop.prevent="changePassword">
                       修改密码
-                    </el-button>
-                    <el-button size="medium" class="mb5"
+                    </button>
+                    <button class="btn btn-sm btn-primary mb5"
                                @click.stop.prevent="$router.push('/matter/list/root?userUuid=' + currentUser.uuid)">
                       {{currentUser.uuid === user.uuid ? '我的文件' : '他的文件'}}
-                    </el-button>
-                    <el-button size="medium" class="mb5"
+                    </button>
+                    <button class="btn btn-sm btn-primary mb5"
                                @click.stop.prevent="$router.push('/user/edit/' + currentUser.uuid)">
                       {{currentUser.uuid === user.uuid ? '编辑个人资料' : '编辑他的资料'}}
-                    </el-button>
+                    </button>
                   </div>
                 </div>
 
diff --git a/src/backyard/user/List.vue b/src/backyard/user/List.vue
index fb72b7d..41c6bd3 100644
--- a/src/backyard/user/List.vue
+++ b/src/backyard/user/List.vue
@@ -6,27 +6,27 @@
 					<span class="item active">文章列表</span>
 				</div>
 			</div>
-		</div>
 
-		<div class="col-md-12">
-			<NbFilter :pager="pager" :callback="search">
-				<router-link class="btn btn-primary btn-sm" to="/user/create">
-					<i class="fa fa-plus"></i>
-					创建用户
-				</router-link>
-			</NbFilter>
-		</div>
 
-		<div class="col-md-12" v-for="(user,index) in pager.data">
-			<div class="bg-white border br4 p10 mb10">
-				<div class="media">
-					<div class="pull-left">
-						<router-link :to="'/user/detail/'+user.uuid">
-							<img class="img-circle img-md" :src="user.getAvatarUrl()">
-						</router-link>
-					</div>
-					<div class="media-body">
-						<div>
+			<div class="col-md-12">
+				<NbFilter :pager="pager" :callback="search">
+					<router-link class="btn btn-primary btn-sm" to="/user/create">
+						<i class="fa fa-plus"></i>
+						创建用户
+					</router-link>
+				</NbFilter>
+			</div>
+
+			<div class="col-md-12" v-for="(user,index) in pager.data">
+				<div class="bg-white border br4 p10 mb10">
+					<div class="media">
+						<div class="pull-left">
+							<router-link :to="'/user/detail/'+user.uuid">
+								<img class="img-circle img-md" :src="user.getAvatarUrl()">
+							</router-link>
+						</div>
+						<div class="media-body">
+							<div>
 							<span class="f16">
 								<router-link class="black" :to="'/user/detail/'+user.uuid">
 											{{user.username}}
@@ -34,27 +34,27 @@
 										      class="text-danger">(It's you)</span>
 								</router-link>
 							</span>
-						</div>
-						<div>
-							<div class="mt5">
-								{{user.getRoleName()}}
 							</div>
-							<div class="mt5">
-								<i class="fa fa-envelope text-success" v-if="user.email"></i>
-								{{user.email}}
+							<div>
+								<div class="mt5">
+									{{user.getRoleName()}}
+								</div>
+								<div class="mt5">
+									<i class="fa fa-envelope text-success" v-if="user.email"></i>
+									{{user.email}}
 
-								<i class="fa fa-phone text-info" v-if="user.phone"></i>
-								{{user.phone}}
+									<i class="fa fa-phone text-info" v-if="user.phone"></i>
+									{{user.phone}}
+								</div>
 							</div>
-						</div>
-						<div class="mv5 text-muted one-line">
-							{{user.description}}
-						</div>
-						<div>
-							<span class="mr10">上次登录: {{user.lastTime | humanTime}}</span>
-							<span class="mr10">上次IP: {{user.lastIp}}</span>
+							<div class="mv5 text-muted one-line">
+								{{user.description}}
+							</div>
+							<div>
+								<span class="mr10">上次登录: {{user.lastTime | humanTime}}</span>
+								<span class="mr10">上次IP: {{user.lastIp}}</span>
 
-							<span class="pull-right action-buttons">
+								<span class="pull-right action-buttons">
 									<router-link :to="'/user/edit/'+user.uuid">
 										<i class="fa fa-pencil text-info f18"></i>
 									</router-link>
@@ -63,18 +63,18 @@
 									</a>
 							</span>
 
+							</div>
 						</div>
 					</div>
 				</div>
 			</div>
-		</div>
 
-		<div class="col-md-12 mt20">
-			<NbPager :pager="pager" :callback="refresh"></NbPager>
-		</div>
+			<div class="col-md-12 mt20">
+				<NbPager :pager="pager" :callback="refresh"></NbPager>
+			</div>
 
+		</div>
 	</div>
-
 </template>
 
 <script>