diff --git a/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css b/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css
index 8fa88b91..fd25b10e 100644
--- a/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css
+++ b/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css
@@ -338,6 +338,21 @@
 	margin: 4px 0 0 0;
 }
 
+/* category edit */
+.edit_cal {
+	margin: -8px;
+	background-color: whitesmoke;
+}
+
+.edit_cal .table td, .edit_cal .table {
+	border: 0 !important;
+	background-color: transparent !important;
+	margin: 0 !important;
+}
+.main-list td {
+	border-top: solid 1px #ddd;
+}
+
 /* create / edit event panel */
 #tags_panel {
 	top: auto;
diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/_calendar.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/_calendar.html.erb
index c03b0d18..bc554c6d 100644
--- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/_calendar.html.erb
+++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/_calendar.html.erb
@@ -1,8 +1,6 @@
 <tr class="with_action" for="<%= calendar.id.to_s %>">
 	<td>
 		<span class="calendars_color_tag" style="background-color: <%= calendar.color %>"></span>
-			<div id="edit_area_<%= calendar.id %>" style="display:hidden;"></div>
-		
 		<div class="quick-edit">
 			<ul class="nav nav-pills hide">
 				<li><%= link_to t("calendar.edit"), edit_panel_calendar_back_end_cal_path(calendar), :remote => true, :class=>"btn-edit-a", :for => calendar.id %></li>
@@ -15,4 +13,7 @@
 			<%= calendar.name_translations[locale] %>
 		</td>
 	<% end %>
+</tr>
+<tr class="with_action">
+	<td colspan="3" id="edit_area_<%= calendar.id %>" style="display:none;"></td>
 </tr>
\ No newline at end of file
diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/edit.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/edit.html.erb
index 9cf6b355..dd6d8578 100644
--- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/edit.html.erb
+++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/edit.html.erb
@@ -1,26 +1,23 @@
 <%= form_for @calendar, :url => panel_calendar_back_end_cal_path(@calendar), :remote => true do |f| %>
-<h4>Edit</h4>
-	<div class="row-fluid">
-		<div class="span2">
-		   <%= label_tag("color", t("calendar.color")) %>
-		   <%= f.text_field :color, :class => "color-picker miniColors", :size => "5", :maxlength => "5", :autocomplete=>"off",:value=>@calendar.color %>
-		</div>
-	</div>
-
-	<div>
-		<%= f.fields_for :name_translations do |name| %>
-			<% @site_valid_locales.each_with_index do |locale, i| %>
-				<div class="control-group">
-					<%= label_tag(locale, t("calendar.name")+"-"+I18nVariable.from_locale(locale)) %>
-					<div class="controls">
-						<%= name.text_field locale, :class => "input-xxlarge", :size=>"30", :value=>@calendar.name_translations[locale] %>
-					</div>
-				</div>
+	<table class="table" style="table-layout: fixed;">
+		<tr>
+			<td>
+			   <!--<%= label_tag("color", t("calendar.color")) %>-->
+			   <%= f.text_field :color, :class => "color-picker miniColors input-small", :maxlength => "5", :autocomplete=>"off",:value=>@calendar.color %>
+			</td>
+			<%= f.fields_for :name_translations do |name| %>
+				<% @site_valid_locales.each_with_index do |locale, i| %>
+					<td class="form-inline">
+						<%= name.text_field locale, :class => "input-large", :value=>@calendar.name_translations[locale] %>
+					</td>
+				<% end %>
 			<% end %>
-		<% end %>
-	</div>
-  <div class="">
-    <%= f.submit t("calendar.save"), :class=>"btn  btn-primary" %>
-  	<button class="btn btn-primary bt-cancel" for="<%= @calendar.id %>">Cancel</button>
-  </div>
+		</tr>	
+		<tr>
+			<td colspan="3">
+				<%= f.submit t("calendar.save"), :class=>"btn  btn-primary" %>
+				<button class="btn btn-primary bt-cancel" for="<%= @calendar.id %>">Cancel</button>
+			</td>
+		</tr>
+  	</table>
 <% end %>
\ No newline at end of file
diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/new.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/new.html.erb
index 80de4ed2..3c63da80 100644
--- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/new.html.erb
+++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/new.html.erb
@@ -1,5 +1,6 @@
 <%= stylesheet_link_tag "jquery.miniColors" %>
 <%= stylesheet_link_tag "calendar" %>
+<%= stylesheet_link_tag "bootstrap-responsive" %>
 <%= javascript_include_tag "jquery.miniColors.min" %>
 <% content_for :page_specific_javascript do %>
   <%= javascript_include_tag "calendarAPI" %>
@@ -57,7 +58,7 @@
 			<% end %>
 		<% end %>
 	</div>
-  <div class="form-actions pagination-right">
+  <div class="form-actions form-fixed pagination-right">
     <%= f.submit t("calendar.save"), :class=>"btn  btn-primary" %>
   </div>
 <% end %>