diff --git a/app/controllers/orbit_admin_controller.rb b/app/controllers/orbit_admin_controller.rb
index f93cfad..9e08844 100644
--- a/app/controllers/orbit_admin_controller.rb
+++ b/app/controllers/orbit_admin_controller.rb
@@ -34,8 +34,8 @@ class OrbitAdminController < ApplicationController
   def filter_fields(categories, tags)
     {
       :status=>[{:title=>"is_top",:id=>"is_top"},{:title=>"is_hot",:id=>"is_hot"},{:title=>"is_hidden",:id=>"is_hidden"}], 
-      :category=>categories.map{|c| {:title=>c.title, :id=>c.id}}, 
-      :tags=>tags.map{|tag| {:title=>tag.name, :id=>tag.id}} 
+      :category=>categories.map{|c| {:title=>(c.title.blank? ? " " : c.title), :id=>c.id}}, 
+      :tags=>tags.map{|tag| {:title=>(tag.name.blank? ? " " : tag.name), :id=>tag.id}} 
     }
   end
 
diff --git a/app/views/admin/categories/_select_form.html.erb b/app/views/admin/categories/_select_form.html.erb
index 2415453..8f3ebe5 100644
--- a/app/views/admin/categories/_select_form.html.erb
+++ b/app/views/admin/categories/_select_form.html.erb
@@ -14,9 +14,13 @@
       </div>
       <div class="modal-body">
         <% @site_in_use_locales.each do |locale| %>
-          <%= label_tag "name-#{locale}", "#{t(:name)} (#{t(locale)})" %>
-          <input class="input-large" id="<%=locale%>" name="category[title_translations][<%=locale%>]" placeholder="<%=t(:name)%>" type="text">
-          <br/><br/>
+          <div class="control-group">
+            <label class="control-label"><%= "#{t(:name)} (#{t(locale)})" %></label>
+            <div class="controls">
+              <input class="input-large" id="<%=locale%>" name="category[title_translations][<%=locale%>]" placeholder="<%=t(:name)%>" type="text">
+              <span class="help-inline hide">Please enter category tite</span>
+            </div>
+          </div>
         <% end %>
       </div>
       <div class="modal-footer">
@@ -28,29 +32,57 @@
 </div>
 
 <script type="text/javascript">
-  $("#categoryModal").hide();
+  $(function(){
+    $("#categoryModal").hide();
+    $('#categoryModal').modal('<%= categories.blank? ? "show" : "hide" %>');
 
-  $('#categoryModal').modal('<%= categories.blank? ? "show" : "hide" %>');
+    $("#add_category").click(createCategory);
 
-  $("#add_category").click(function(){
-    createCategory();
+    $("#categoryModal .modal-body").keypress(function(e) {
+      if(e.which == 13) {
+        createCategory();
+        return false;
+      }
+    });
+
+    $.each($('#categoryModal .input-large'),function(){
+      $(this).blur(function(){
+        if($(this).val()==""){
+          $(this).parent().parent().addClass('error');
+          $(this).next().removeClass('hide');
+        }else{
+          $(this).parent().parent().removeClass('error');
+          $(this).next().addClass('hide');
+        }
+      });
+    });
   });
 
-  $("#categoryModal .modal-body").keypress(function(e) {
-    if(e.which == 13) {
-      createCategory();
-      return false;
-    }
-});
-
   var createCategory = function(){
-    $.ajax({
-      url : "<%= create_in_form_admin_module_app_categories_path(:module_app_id=>module_app.id.to_s) %>",
-      type : "post",
-      data: $("input[name^='category']").serialize(),
-    }).done(function(data){
-      $("#select_categories select").append("<option value='"+data['id']+"' selected>"+data['title']+"</option>");
-      $('#categoryModal').modal('hide');
+    var valid = true;
+    $.each($('#categoryModal .input-large'),function(){
+      if($(this).val()==""){
+        $(this).parent().parent().addClass('error');
+        $(this).next().removeClass('hide');
+        valid = false;
+      }else{
+        $(this).parent().parent().removeClass('error');
+        $(this).next().addClass('hide');
+      }
     });
+
+    if(valid){
+      $.ajax({
+        url : "<%= create_in_form_admin_module_app_categories_path(:module_app_id=>module_app.id.to_s) %>",
+        type : "post",
+        data: $("input[name^='category']").serialize(),
+      }).done(function(data){
+        $.each($('#categoryModal .input-large'),function(){
+          $(this).val("");
+        });
+        $("#select_categories select").append("<option value='"+data['id']+"' selected>"+data['title']+"</option>");
+        $('#categoryModal').modal('hide');
+      });
+    }
   }
 </script>
\ No newline at end of file
diff --git a/app/views/admin/tags/_tag_form.html.erb b/app/views/admin/tags/_tag_form.html.erb
index 565f4b3..b43bcda 100644
--- a/app/views/admin/tags/_tag_form.html.erb
+++ b/app/views/admin/tags/_tag_form.html.erb
@@ -20,9 +20,13 @@
       </div>
       <div class="modal-body">
         <% @site_in_use_locales.each do |locale| %>
-          <%= label_tag "name-#{locale}", "#{t(:name)} (#{t(locale)})" %>
-          <input class="input-large" id="<%=locale%>" name="tag[name_translations][<%=locale%>]" placeholder="<%=t(:name)%>" type="text">
-          <br/><br/>
+          <div class="control-group">
+            <label class="control-label"><%= "#{t(:name)} (#{t(locale)})" %></label>
+            <div class="controls">
+              <input class="input-large" id="<%=locale%>" name="tag[name_translations][<%=locale%>]" placeholder="<%=t(:name)%>" type="text">
+              <span class="help-inline hide">Please enter tag name</span>
+            </div>
+          </div>
         <% end %>
       </div>
       <div class="modal-footer">
@@ -34,29 +38,57 @@
 </div>
 
 <script type="text/javascript">
-  $("#tagModal").hide();
+  $(function(){
+    $("#tagModal").hide();
+    $("#add_tag").click(createTag);
 
-  $("#add_tag").click(function(){
-    createTag();
+    $("#tagModal .modal-body").keypress(function(e) {
+      if(e.which == 13) {
+        createTag();
+        return false;
+      }
+    });
+
+    $.each($('#tagModal .input-large'),function(){
+      $(this).blur(function(){
+        if($(this).val()==""){
+          $(this).parent().parent().addClass('error');
+          $(this).next().removeClass('hide');
+        }else{
+          $(this).parent().parent().removeClass('error');
+          $(this).next().addClass('hide');
+        }
+      });
+    });
   });
 
-  $("#tagModal .modal-body").keypress(function(e) {
-    if(e.which == 13) {
-      createTag();
-      return false;
-    }
-});
-
   var createTag = function(){
-    $.ajax({
-      url : "<%= create_in_form_admin_module_app_tags_path(:module_app_id=>module_app.id.to_s) %>",
-      type : "post",
-      data: $("input[name^='tag']").serialize(),
-    }).done(function(data){
-      $("#select_tags .controls").append('<label class="checkbox inline btn active">'+
-                                                '<input id="<%= f.object.class.name.underscore %>_tags_" name="<%= f.object.class.name.underscore %>[tags][]" type="checkbox" value="'+data.id+'" checked>'+data.name+'</label>');
-      $("#add_tag_btn").css("margin-left", "180px");
-      $('#tagModal').modal('hide');
+    var valid = true;
+    $.each($('#tagModal .input-large'),function(){
+      if($(this).val()==""){
+        $(this).parent().parent().addClass('error');
+        $(this).next().removeClass('hide');
+        valid = false;
+      }else{
+        $(this).parent().parent().removeClass('error');
+        $(this).next().addClass('hide');
+      }
     });
+
+    if(valid){
+      $.ajax({
+        url : "<%= create_in_form_admin_module_app_tags_path(:module_app_id=>module_app.id.to_s) %>",
+        type : "post",
+        data: $("input[name^='tag']").serialize(),
+      }).done(function(data){
+        $.each($('#tagModal .input-large'),function(){
+          $(this).val("");
+        });
+        $("#select_tags .controls").append('<label class="checkbox inline btn active">'+
+                                                  '<input id="<%= f.object.class.name.underscore %>_tags_" name="<%= f.object.class.name.underscore %>[tags][]" type="checkbox" value="'+data.id+'" checked>'+data.name+'</label>');
+        $("#add_tag_btn").css("margin-left", "180px");
+        $('#tagModal').modal('hide');
+      });
+    }
   }
 </script>
\ No newline at end of file