diff --git a/src/noosfero-spb/software_communities/lib/software_events_block.rb b/src/noosfero-spb/software_communities/lib/software_events_block.rb
index ca5ec33..284b9ae 100644
--- a/src/noosfero-spb/software_communities/lib/software_events_block.rb
+++ b/src/noosfero-spb/software_communities/lib/software_events_block.rb
@@ -10,7 +10,7 @@ class SoftwareEventsBlock < Block
 
   def content(args={})
     today = DateTime.now.beginning_of_day
-    events = self.owner.events.where("start_date >= ? AND end_date >= ?", today, today).order(:start_date)
+    events = self.owner.events.where("end_date >= ?", today).order(:start_date)
 
     block = self
 
diff --git a/src/noosfero-spb/software_communities/views/blocks/_software_events_list_item.html.erb b/src/noosfero-spb/software_communities/views/blocks/_software_events_list_item.html.erb
index c1f1bea..6994ded 100644
--- a/src/noosfero-spb/software_communities/views/blocks/_software_events_list_item.html.erb
+++ b/src/noosfero-spb/software_communities/views/blocks/_software_events_list_item.html.erb
@@ -1,11 +1,9 @@
-<div class="software-events-list-item">
-  <div class="software-events-list-item-calendar"></div>
+<span class="software-events-list-item-calendar"></span>
 
-  <div class="software-events-list-item-date">
-    <%= event.start_date.strftime "%m/%d" %>
-  </div>
+<span class="software-events-list-item-date">
+  <%= event.start_date.strftime "%d/%m - " %>
+</span>
 
-  <div class="software-events-list-item-title">
-    <%= link_to event.title, event.url %>
-  </div>
-</div>
+<span class="software-events-list-item-title">
+  <%= link_to event.title, event.url %>
+</span>
diff --git a/src/noosfero-spb/software_communities/views/blocks/software_events.html.erb b/src/noosfero-spb/software_communities/views/blocks/software_events.html.erb
index 7bde8fc..13802ce 100644
--- a/src/noosfero-spb/software_communities/views/blocks/software_events.html.erb
+++ b/src/noosfero-spb/software_communities/views/blocks/software_events.html.erb
@@ -3,16 +3,11 @@
 
   <ul class="software-community-events-list">
     <% events.each do |event| %>
-    <li>
+    <li class="software-events-list-item">
       <%= render :partial=>"blocks/software_events_list_item",
                  :locals => {:event => event} %>
     </li>
     <% end %>
   </ul>
-
-  <% else %>
-    <div class="software-community-events-no-event">
-      <%= _("This community does not have any events yet") %>
-    </div>
   <% end %>
-</div>
\ No newline at end of file
+</div>
--
libgit2 0.21.2