diff --git a/app/assets/images/ncculogo.ico b/app/assets/images/ncculogo.ico
new file mode 100644
index 000000000..3aa5e1c67
Binary files /dev/null and b/app/assets/images/ncculogo.ico differ
diff --git a/app/views/layouts/new_admin.html.erb b/app/views/layouts/new_admin.html.erb
index 4686545ec..51a961904 100644
--- a/app/views/layouts/new_admin.html.erb
+++ b/app/views/layouts/new_admin.html.erb
@@ -3,6 +3,7 @@
 <head>
 <meta charset="utf-8">
 	<title><%= @title || APP_CONFIG['orbit'] %></title>
+	<link rel="shortcut icon" href="<%= asset_path "ncculogo.ico" %>">
 	<!--[if lt IE 9]>
 	   <%= javascript_include_tag "html5" %>
 	<![endif]-->
diff --git a/app/views/layouts/page_layout.html.erb b/app/views/layouts/page_layout.html.erb
index dd9aa94ad..0a7240ef3 100644
--- a/app/views/layouts/page_layout.html.erb
+++ b/app/views/layouts/page_layout.html.erb
@@ -3,6 +3,7 @@
 <head>
 <meta charset="utf-8">
 	<%= page_title(@item).html_safe %>
+	<link rel="shortcut icon" href="<%= asset_path "ncculogo.ico" %>">
 	<%= page_metas(@item).html_safe %>
 	<!--[if lt IE 9]>
 	   <%= javascript_include_tag "html5" %>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb
index c6d0c06d2..17d5d4b70 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb
@@ -15,15 +15,18 @@
 	<%= @bulletin.text[I18n.locale].html_safe %>
 </div>
 
-<b><%= t('announcement.link') %></b>
-<% @bulletin.bulletin_links.each do | blink | %>
-  <%= link_to blink.i18n_variable[I18n.locale], blink.url, :target => '_blank' %>
+<% if @bulletin.bulletin_links.size > 0 %>
+	<b><%= t('announcement.link') %></b>
+	<% @bulletin.bulletin_links.each do | blink | %>
+	  <%= link_to blink.i18n_variable[I18n.locale], blink.url, :target => '_blank' %>
+	<% end %>
 <% end %>
-</li>
-<li>
-<b><%= t('announcement.file') %></b>
-<% @bulletin.bulletin_files.each do | bfile | %>
-<%= link_to bfile.filetitle[I18n.locale], bfile.file.url, {:target => '_blank', :title => bfile.description} if bfile.file.file %>
+
+<% if @bulletin.bulletin_files.size > 0 %>
+	<b><%= t('announcement.file') %></b>
+	<% @bulletin.bulletin_files.each do | bfile | %>
+	<%= link_to bfile.filetitle[I18n.locale], bfile.file.url, {:target => '_blank', :title => bfile.description} if bfile.file.file %>
+	<% end %>
 <% end %>
 
 <div class="fb">
diff --git a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb
index ed957be27..7b3b63994 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb
@@ -8,25 +8,24 @@
 	<h1 class="h1"><%= t('news.list_news') %></h1>
 <% end %>
 
-
 <table class="table table-bordered">
-  <tr>
-	<th><%= t('news.news_bulletin.category') %></th>
-	<th><%= t('news.news_bulletin.title') %></th>
-	<th><%= t('news.news_bulletin.postdate') %></th>
-  </tr>
-
-<% @news_bulletins.each do |post| %>
-  <tr>
-	<td><%= post.news_bulletin_category.i18n_variable[I18n.locale] %></td>
-	<td><%= link_to post.title[I18n.locale], panel_news_front_end_news_bulletin_path(post) %>
-	<%#= link_to post.title, panel_news_back_end_news_bulletin_path(post) %>
-	</td>
-	<td><%= post.postdate %></td>
-  </tr>
-  
-<% end %>
-
+  <tbody>
+  	<tr>
+  		<th><%= t('news.news_bulletin.image') %></th>
+			<th><%= t('news.news_bulletin.title') %></th>
+			<th><%= t('news.news_bulletin.postdate') %></th>
+	  </tr>
+	  <% @news_bulletins.each do |post| %>
+		  <tr>
+		  	<td><%= image_tag post.image %></td>
+				<td>
+					<%= link_to post.title[I18n.locale], panel_news_front_end_news_bulletin_path(post) %>
+					<%= post.subtitle[I18n.locale].html_safe %>
+				</td>
+				<td><%= post.postdate %></td>
+		  </tr>
+		<% end %> 
+	</tbody>
 </table>
 
 <%= paginate @news_bulletins, :params => {:inner => 'false'} %>
diff --git a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/show.html.erb b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/show.html.erb
index 14659c077..fae904cb0 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/show.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/show.html.erb
@@ -15,15 +15,18 @@
 	<%= @news_bulletin.text[I18n.locale].html_safe %>
 </div>
 
-<b><%= t('announcement.link') %></b>
-<% @news_bulletin.bulletin_links.each do | blink | %>
-  <%= link_to blink.i18n_variable[I18n.locale], blink.url, :target => '_blank' %>
+<% if @news_bulletin.news_bulletin_links.size > 0 %>
+	<b><%= t('announcement.link') %></b>
+	<% @news_bulletin.news_bulletin_links.each do | blink | %>
+	  <%= link_to blink.i18n_variable[I18n.locale], blink.url, :target => '_blank' %>
+	<% end %>
 <% end %>
-</li>
-<li>
-<b><%= t('announcement.file') %></b>
-<% @news_bulletin.bulletin_files.each do | bfile | %>
-<%= link_to bfile.filetitle[I18n.locale], bfile.file.url, {:target => '_blank', :title => bfile.description} if bfile.file.file %>
+
+<% if @news_bulletin.news_bulletin_files.size > 0 %>
+	<b><%= t('announcement.file') %></b>
+	<% @news_bulletin.news_bulletin_files.each do | bfile | %>
+	<%= link_to bfile.filetitle[I18n.locale], bfile.file.url, {:target => '_blank', :title => bfile.description} if bfile.file.file %>
+	<% end %>
 <% end %>
 
 <div class="fb">
