diff --git a/app/assets/stylesheets/list.css b/app/assets/stylesheets/list.css
index 60052ac2..6808e533 100644
--- a/app/assets/stylesheets/list.css
+++ b/app/assets/stylesheets/list.css
@@ -161,6 +161,6 @@ legend {
 	top: 10px;
 	left: 5px;
 }
-.list-remove {
+#sort_headers .list-remove {
 	padding: 8px 0 8px 16px !important;
 }
\ No newline at end of file
diff --git a/app/assets/stylesheets/style.css.erb b/app/assets/stylesheets/style.css.erb
index e0a704ef..ac151e90 100644
--- a/app/assets/stylesheets/style.css.erb
+++ b/app/assets/stylesheets/style.css.erb
@@ -109,7 +109,8 @@
 	text-indent: -9999px;
 	padding:6px;
 }
-#orbit-bar .nav > li.search {
+#orbit-bar .nav > li.search {
+	background-image: none;
 	overflow: hidden;
 	width: 28px;
 	position: relative;
@@ -322,6 +323,9 @@
 #main-wrap .breadcrumb li {
 	font-size: 12px;
 	color: #999;
+}
+.form-actions .btn {
+	margin-bottom: 0;
 }
 #sub-wiget {
 	clear: right;
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb
index d1cf86ed..1acadcb1 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb
@@ -2,9 +2,14 @@
 	<%= stylesheet_link_tag "inc/permission-checkbox"  %>
 <% end %>
 <% content_for :page_specific_javascript do %>
+<<<<<<< HEAD
 	<%= javascript_include_tag "bootstrap"  %>
 	<%#= javascript_include_tag "inc/permission-checkbox"  %>
 	<%#= javascript_include_tag "inc/search"  %>
+=======
+	<%= javascript_include_tag "inc/permission-checkbox"  %>
+	<%= javascript_include_tag "inc/search"  %>
+>>>>>>> 291d5e3a03ba7da62ceb5e3b18012f0c9198dfba
 <% end %>
 <%#= label_tag :fact_check_setting, t("announcement.bulletin.fact_check_setting") %>
 <%= form_tag('', :remote => true)  %>