diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb
index 2e51f4f9749caff2ad32fd00110e7491a0894c92..25859ba9afef69e4fdb4303f54aa17f87f7dccad 100644
--- a/app/controllers/collections_controller.rb
+++ b/app/controllers/collections_controller.rb
@@ -36,7 +36,7 @@ class CollectionsController < ApplicationController
       @own = user_signed_in? ? @collection.owner?(current_user) : false
     end
 
-    @reviews = Review.where(reviewable: @collection)
+    @reviews = Review.includes(:user).where(reviewable: @collection)
 
     render partial: 'list' if params[:list] == 'true'
   end
diff --git a/app/controllers/learning_objects_controller.rb b/app/controllers/learning_objects_controller.rb
index ebb2677845277f276100bb104483aabe478d3be8..e92f8208cbc2a6e2727dd22577497d7f361e09a7 100644
--- a/app/controllers/learning_objects_controller.rb
+++ b/app/controllers/learning_objects_controller.rb
@@ -15,7 +15,7 @@ class LearningObjectsController < ApplicationController
   # GET /learning_objects/1.json
   def show
     @liked = !@learning_object.likes.where(user: current_user).blank? if user_signed_in?
-    @reviews = Review.where(reviewable: @learning_object)
+    @reviews = Review.includes(:user).where(reviewable: @learning_object)
   end
 
   # GET /learning_objects/new
diff --git a/app/views/collections/show.html.erb b/app/views/collections/show.html.erb
index 8b1d8f2de15bb57f1bd523fc7db8fbd44b08c1e5..dbcbb382e780785aac38462b6ab1b717cadf207e 100644
--- a/app/views/collections/show.html.erb
+++ b/app/views/collections/show.html.erb
@@ -64,6 +64,8 @@
   </div>
 </nav>
 
+<%= link_to 'Avalie esta coleção!', new_review_path(reviewable_id: @collection.id, reviewable_type: @collection.class.name), class: 'btn btn-success'  %>
+
 <div class="row">
   <div class="learning-object-columns">
     <br/>
diff --git a/app/views/learning_objects/show.html.erb b/app/views/learning_objects/show.html.erb
index bb86cd80c53f339e4bde5968a8650ccdb6eab564..6e5105d03f682237a25cb8afa243a15b9c5c53fe 100644
--- a/app/views/learning_objects/show.html.erb
+++ b/app/views/learning_objects/show.html.erb
@@ -85,9 +85,6 @@
       </div>
     </div>
   </div>
-  <div class="col-md-12">
-    <%= render 'reviews/list' %>
-  </div>
 </div>
 <br/>
 
@@ -129,7 +126,14 @@
     </div>
   </div>
 </div>
+<%= link_to 'Avalie este objeto!', new_review_path(reviewable_id: @learning_object.id, reviewable_type: @learning_object.class.name), class: 'btn btn-success'  %>
 
+<br/><br/>
+<div class="row">
+  <div class="col-md-12">
+    <%= render 'reviews/list' %>
+  </div>
+</div>
 
 <script type="text/javascript">
   $(".view video").hover(function(event) {