diff --git a/templates/contest/ranking-table.html b/templates/contest/ranking-table.html
index 5779fe8..f74cd74 100644
--- a/templates/contest/ranking-table.html
+++ b/templates/contest/ranking-table.html
@@ -10,7 +10,7 @@
 
 {% block after_rank %}
     {% if has_rating %}
-        <td>{% if user.participation_rating %}{{ rating_number(user.participation_rating) }}{% endif %}</td>
+        <td class="rating-column">{% if user.participation_rating %}{{ rating_number(user.participation_rating) }}{% endif %}</td>
     {% endif %}
 {% endblock %}
 
@@ -57,6 +57,7 @@
         <th class="points header problem-score-col" title="{{ problem.problem.name }}"><a href="{{ url('problem_detail', problem.problem.code) }}">
             {{- contest.get_label_for_problem(loop.index0) }}
             <div class="point-denominator">{{ problem.points }}</div>
+            <div class="problem-code" style="display: none;">{{ problem.problem.code }}</div>
         </a></th>
     {% endfor %}
 {% endblock %}
diff --git a/templates/contest/ranking.html b/templates/contest/ranking.html
index 087a905..b3813c4 100644
--- a/templates/contest/ranking.html
+++ b/templates/contest/ranking.html
@@ -88,9 +88,9 @@
                             return;
                         } else if ($col.hasClass('username')) {
                             header.push(clean_text($col.text()));
-                            header.push("Name");
+                            header.push("Full name");
                         } else if ($col.hasClass('problem-score-col')) {
-                            header.push($col.attr("title"));
+                            header.push(clean_text($col.find('.problem-code').tex()));
                         } else {
                             header.push(clean_text($col.text()));
                         }
@@ -153,7 +153,10 @@
         <input id="show-virtual-checkbox" type="checkbox" style="vertical-align: bottom;">
         <label id="show-virtual-label" for="show-virtual-checkbox" style="vertical-align: bottom; margin-right: 1em;">{{ _('Show virtual participation') }}</label>
         <img src="{{static('loading.gif')}}" style="height: 1em; display:none;" id="loading-gif"></img>
-        <a href="#" onclick="download_ranking_as_csv()" style="float: right;">{{ _('Download as CSV') }}</a>
+        <a href="#" onclick="download_ranking_as_csv()" style="float: right;">
+            <i class="fa fa-download" aria-hidden="true"></i>
+            {{ _('Download as CSV') }}
+        </a>
     </div>
     {% include "contest/ranking-table.html" %}
 {% endblock %}
\ No newline at end of file