diff --git a/app/controllers/guides_controller.rb b/app/controllers/guides_controller.rb
index 6b5467cac..6bb87c001 100644
--- a/app/controllers/guides_controller.rb
+++ b/app/controllers/guides_controller.rb
@@ -32,7 +32,7 @@ def create
 
   def show
     if current_user?
-      @stats = @guide.stats(current_user)
+      @stats = @guide.stats_for(current_user)
       @next_exercise = @guide.next_exercise(current_user)
     else
       @next_exercise = @guide.first_exercise
diff --git a/app/controllers/paths_controller.rb b/app/controllers/paths_controller.rb
new file mode 100644
index 000000000..d1ef8d8b9
--- /dev/null
+++ b/app/controllers/paths_controller.rb
@@ -0,0 +1,7 @@
+class PathsController < ApplicationController
+  before_action :authenticate!
+
+  def show
+    @path = Path.find(params[:id])
+  end
+end
diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb
index 13469167f..da2a22b46 100644
--- a/app/controllers/submissions_controller.rb
+++ b/app/controllers/submissions_controller.rb
@@ -1,6 +1,8 @@
-class SubmissionsController < ApplicationController #FIXME remove
+class SubmissionsController < ApplicationController
+  include NestedInUser
+
   before_action :authenticate!
   def index
-    @submissions = paginated current_user.submissions
+    @submissions = paginated @user.submissions.order(updated_at: :desc), 50
   end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 35494e0e7..def15199f 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -31,15 +31,13 @@ def tab_list(tabs)
   end
 
   def next_guides_box(guide, options={})
+    return if guide.path.blank?
+
     suggested = guide.next_guides
     if suggested.empty?
-      nil
-    elsif suggested.size == 1 || options[:only_first]
-      link_to t(:next_guide), suggested.first, class: 'btn btn-success'
+      t :path_finished, path: link_to_path(guide.path)
     else
-      ('<ul class="list-group text-center">' +
-      suggested.map {|it| "<li class=\"list-group-item\">#{link_to_guide(it)}</li>"}.join("\n")  +
-      '</ul>').html_safe
+      link_to t(:next_guide, name: suggested.first.name), suggested.first, class: 'btn btn-success'
     end
   end
 
diff --git a/app/helpers/concerns/with_breadcrumbs.rb b/app/helpers/concerns/with_breadcrumbs.rb
new file mode 100644
index 000000000..27d2986ca
--- /dev/null
+++ b/app/helpers/concerns/with_breadcrumbs.rb
@@ -0,0 +1,23 @@
+module WithBreadcrumbs
+  def exercise_breadcrumb(e)
+    base = link_to_exercise e
+    if e.guide
+      "#{guide_breadcrumb(e.guide)}/#{base}".html_safe
+    else
+      base
+    end
+  end
+
+  def guide_breadcrumb(g)
+    base = link_to_guide g
+    if g.path
+      "#{path_breadcrumb(g.path)}/#{base}".html_safe
+    else
+      base
+    end
+  end
+
+  def path_breadcrumb(p)
+    link_to_path p
+  end
+end
diff --git a/app/helpers/concerns/with_links_rendering.rb b/app/helpers/concerns/with_links_rendering.rb
index c7d944d68..105b6ffb5 100644
--- a/app/helpers/concerns/with_links_rendering.rb
+++ b/app/helpers/concerns/with_links_rendering.rb
@@ -15,4 +15,7 @@ def link_to_user(user)
     link_to user.name, user
   end
 
+  def link_to_path(path)
+    link_to path.name, path
+  end
 end
diff --git a/app/helpers/concerns/with_stats_rendering.rb b/app/helpers/concerns/with_stats_rendering.rb
index f165bd6f5..077112f11 100644
--- a/app/helpers/concerns/with_stats_rendering.rb
+++ b/app/helpers/concerns/with_stats_rendering.rb
@@ -1,5 +1,5 @@
 module WithStatsRendering
-  def stats(stats, k)
+  def stats_html(stats, k)
     "#{stats.send k} #{status_icon(k)} ".html_safe
   end
 
diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
new file mode 100644
index 000000000..b9c35f581
--- /dev/null
+++ b/app/helpers/user_helper.rb
@@ -0,0 +1,3 @@
+module UserHelper
+  include WithBreadcrumbs
+end
diff --git a/app/models/category.rb b/app/models/category.rb
index 9a8740c7f..d9bc615a0 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -6,7 +6,7 @@ class Category < ActiveRecord::Base
 
   validates_presence_of :name, :description, :image_url
 
-  markup_on :description
+  markup_on :description, :long_description, :links
 
   def single_path?
     paths.size == 1
diff --git a/app/models/concerns/with_siblings.rb b/app/models/concerns/with_siblings.rb
index e9bd98b7f..521594ff5 100644
--- a/app/models/concerns/with_siblings.rb
+++ b/app/models/concerns/with_siblings.rb
@@ -16,5 +16,13 @@ def previous
   def orphan?
     parent.nil?
   end
+
+  def contextualized_name
+    if parent
+      "#{position}. #{name}"
+    else
+      name
+    end
+  end
 end
 
diff --git a/app/models/exercise.rb b/app/models/exercise.rb
index 8b620864a..92fe6e983 100644
--- a/app/models/exercise.rb
+++ b/app/models/exercise.rb
@@ -46,14 +46,6 @@ def generate_original_id!
     update!(original_id: id) unless original_id
   end
 
-  def contextualized_title
-    if guide
-      "#{position}. #{title}"
-    else
-      title
-    end
-  end
-
   def collaborator?(user)
     guide.present? && guide.authored_by?(user)
   end
@@ -76,4 +68,8 @@ def defaults
   def self.default_layout
     layouts.keys[0]
   end
+
+  def name #FIXME remove
+    title
+  end
 end
diff --git a/app/models/guide.rb b/app/models/guide.rb
index 2c41917eb..1842963b5 100644
--- a/app/models/guide.rb
+++ b/app/models/guide.rb
@@ -13,7 +13,8 @@ class Guide < ActiveRecord::Base
           WithLocale,
           WithCollaborators,
           WithPath,
-          WithExercises
+          WithExercises,
+          WithStats
 
   #TODO rename name to title. This helps building also generic link_to compoenetns
   has_many :imports, -> { order(created_at: :desc)}
@@ -32,10 +33,6 @@ def search_tags
     exercises.flat_map(&:search_tags).uniq
   end
 
-  def stats(user)
-    Stats.from_statuses exercises.map { |it| it.status_for(user) }
-  end
-
   def github_url
     "https://github.com/#{github_repository}"
   end
diff --git a/app/models/language.rb b/app/models/language.rb
index 7baaa98b6..994890e3c 100644
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -10,7 +10,7 @@ class Language < ActiveRecord::Base
 
   validates :name, presence: true, uniqueness: {case_sensitive: false}
 
-  markup_on :test_syntax_hint
+  markup_on :test_syntax_hint, :description
 
   def run_tests!(request)
     bridge.run_tests!(request)
diff --git a/app/models/path.rb b/app/models/path.rb
index 228d60cdb..9f9560e95 100644
--- a/app/models/path.rb
+++ b/app/models/path.rb
@@ -1,9 +1,11 @@
 class Path < ActiveRecord::Base
-  include WithGuides
+  include WithGuides, WithStats
 
   belongs_to :category
   belongs_to :language
 
+  has_many :exercises, through: :guides
+
   def name
     if category.single_path?
       category.name
diff --git a/app/models/stats.rb b/app/models/stats.rb
index 8771e6c60..33a64c37f 100644
--- a/app/models/stats.rb
+++ b/app/models/stats.rb
@@ -35,16 +35,20 @@ def started?
     submitted > 0
   end
 
+  def resolved_ratio
+    ratio resolved
+  end
+
   def passed_ratio
-    100 * passed / total.to_f
+    ratio passed
   end
 
   def passed_with_warnings_ratio
-    100 * passed_with_warnings / total.to_f
+    ratio passed_with_warnings
   end
 
   def failed_ratio
-    100 * failed / total.to_f
+    ratio failed
   end
 
   def to_h(&key)
@@ -60,4 +64,10 @@ def self.from_statuses(statuses)
       accum
     end)
   end
+
+  private
+
+  def ratio(x)
+    (100 * x / total.to_f).round(2)
+  end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index f7823043b..be16d9f8d 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -18,7 +18,9 @@ class User < ActiveRecord::Base
            class_name: 'Exercise',
            source: :exercise
 
-  has_many :submitted_guides, -> { uniq.order(:position) }, through: :submitted_exercises, class_name: 'Guide', source: :guide
+  has_many :submitted_guides, -> { uniq }, through: :submitted_exercises, class_name: 'Guide', source: :guide
+
+  has_many :submitted_paths, -> { uniq }, through: :submitted_guides, class_name: 'Path', source: :path
 
   has_many :solved_exercises,
            -> { where('submissions.status' => Status::Passed.to_i).uniq },
diff --git a/app/models/with_stats.rb b/app/models/with_stats.rb
new file mode 100644
index 000000000..2cca19ed8
--- /dev/null
+++ b/app/models/with_stats.rb
@@ -0,0 +1,5 @@
+module WithStats
+  def stats_for(user)
+    Stats.from_statuses exercises.map { |it| it.status_for(user) }
+  end
+end
diff --git a/app/views/exercise_submissions/_results.html.erb b/app/views/exercise_submissions/_results.html.erb
index 5d11b3fb2..ff9185d89 100644
--- a/app/views/exercise_submissions/_results.html.erb
+++ b/app/views/exercise_submissions/_results.html.erb
@@ -1,6 +1,6 @@
 <%
    @guide = @exercise.guide
-   @stats = @guide.stats(current_user) if @guide
+   @stats = @guide.stats_for(current_user) if @guide
 %>
 
 
@@ -56,7 +56,7 @@
               class: 'text-warning warning pull-left' %>
   <%= next_button(@exercise) %>
 
-  <%= next_guides_box(@guide, only_first: true) if @stats.try &:done? %>
+  <%= next_guides_box(@guide) if @stats.try &:done? %>
 </div>
 
 <script>
diff --git a/app/views/exercises/show.html.erb b/app/views/exercises/show.html.erb
index 52b01118b..184b32586 100644
--- a/app/views/exercises/show.html.erb
+++ b/app/views/exercises/show.html.erb
@@ -60,7 +60,6 @@
             </div>
             <div class="row">
               <div class="col-md-12 text-center">
-                <h4><%= t :see_next_guides %></h4>
                 <%= next_guides_box(@guide) %>
               </div>
             </div>
diff --git a/app/views/guides/show.html.erb b/app/views/guides/show.html.erb
index eb2d2dea0..ebad7a94c 100644
--- a/app/views/guides/show.html.erb
+++ b/app/views/guides/show.html.erb
@@ -9,15 +9,12 @@
     <div class="col-md-12">
       <div>
         <h3><%= t :about_this_guide %></h3>
-
-        <p>
-          <%= @guide.description_html %>
-        </p>
+        <%= @guide.description_html %>
       </div>
     </div>
   </div>
 
-  <% if current_user? %>
+  <% if current_user? && @stats.started? %>
     <div class="row">
       <div class="col-md-5">
         <h3><%= t :stats %></h3>
@@ -27,20 +24,16 @@
         </p>
 
         <p>
-          <%= raw t :passed_exercises_stats, count: stats(@stats, :passed) %>
-          <%= raw t :failed_exercises_stats, count: stats(@stats, :failed) %>
-          <%= raw t :unknown_exercises_stats, count: stats(@stats, :unknown) %>
+          <%= raw t :passed_exercises_stats, count: stats_html(@stats, :passed) %>
+          <%= raw t :failed_exercises_stats, count: stats_html(@stats, :failed) %>
+          <%= raw t :unknown_exercises_stats, count: stats_html(@stats, :unknown) %>
         </p>
 
         <p>
           <% if @stats.done? %>
             ¡Eso significa que <strong>ya terminaste esta guía</strong>! ¡Bien hecho!
-            Tenemos más guías para vos:
-            <%= next_guides_box @guide %>
           <% elsif @stats.good_progress? %>
             <%= raw t :good_progress_in_guide %>
-          <% elsif !@stats.started? %>
-            <%= raw t :not_started_guide %>
           <% elsif @stats.stuck? %>
             <%= raw t :stuck_in_guide %>
           <% end %>
@@ -52,7 +45,7 @@
       </div>
     </div>
 
-  <% else %>
+  <% elsif !current_user?  %>
 
     <div class="row">
       <div class="col-md-12">
@@ -70,11 +63,16 @@
 
   <% end %>
 
-  <% unless @stats.try :done? %>
+  <% if @stats.try :done? %>
+    <%= corollary_box(@guide) %>
+    <div class="actions">
+      <%= next_guides_box @guide %>
+    </div>
+  <% else %>
     <div class="row">
       <div class="col-md-12">
         <div class="actions">
-          <% if @next_exercise  %>
+          <% if @next_exercise %>
             <%= link_to t(practice_key_for(@stats)), exercise_path(@next_exercise), class: 'btn btn-primary' %>
           <% end %>
         </div>
diff --git a/app/views/layouts/_exercise.html.erb b/app/views/layouts/_exercise.html.erb
index f72175589..32a74cf97 100644
--- a/app/views/layouts/_exercise.html.erb
+++ b/app/views/layouts/_exercise.html.erb
@@ -1,10 +1,10 @@
-<% @stats = @exercise.guide.stats(current_user) if current_user && @exercise.guide %>
+<% @stats = @exercise.guide.stats_for(current_user) if current_user && @exercise.guide %>
 
 
 <div class="row">
   <div class="col-md-12">
     <h1 style="display: inline-block">
-      <%= @exercise.contextualized_title %>
+      <%= @exercise.contextualized_name %>
     </h1>
     <span style="margin-left: 5px">
       <a data-toggle="collapse" href="#about-section" class="text-info">
diff --git a/app/views/layouts/_guide.html.erb b/app/views/layouts/_guide.html.erb
index f9f39cb30..0c8ac0733 100644
--- a/app/views/layouts/_guide.html.erb
+++ b/app/views/layouts/_guide.html.erb
@@ -3,7 +3,7 @@
 <div class="row">
   <div class="col-md-12">
     <h1>
-      <%= @guide.name %>
+      <%= @guide.contextualized_name %>
       <small> - <%= @guide.language %></small>
     </h1>
     <h4><%= with_classifications  @guide %></h4>
@@ -11,7 +11,7 @@
     <% if @guide.path %>
       <p>
         <%= previous_nav_button(@guide) %>
-        <span><%= @guide.path.name %></span>
+        <span><%= link_to_path @guide.path %></span>
         <%= next_nav_button(@guide) %>
       </p>
     <% end%>
diff --git a/app/views/layouts/_user.html.erb b/app/views/layouts/_user.html.erb
index e9f8b7fc2..bc11f58b6 100644
--- a/app/views/layouts/_user.html.erb
+++ b/app/views/layouts/_user.html.erb
@@ -18,11 +18,14 @@
       <li <%= active_if :overview %>>
         <%= link_to t(:overview), @user %>
       </li>
+      <li <%= active_if :recent_activity %>>
+        <%= link_to t(:recent_activity), user_submissions_path(@user) %>
+      </li>
       <li <%= active_if :exercises %>>
-        <%= link_to t(:exercise).pluralize, user_exercises_path(@user) %>
+        <%= link_to t(:created_exercises), user_exercises_path(@user) %>
       </li>
       <li <%= active_if :guides %>>
-        <%= link_to t(:guide).pluralize, user_guides_path(@user) %>
+        <%= link_to t(:created_guides), user_guides_path(@user) %>
       </li>
     </ul>
   </div>
diff --git a/app/views/paths/show.html.erb b/app/views/paths/show.html.erb
new file mode 100644
index 000000000..57e0f5500
--- /dev/null
+++ b/app/views/paths/show.html.erb
@@ -0,0 +1,31 @@
+<h1><%= @path.name %></h1>
+<%= @path.category.long_description_html %>
+
+<% if @path.language.description.present? %>
+  <div>
+    <h2><%= "Sobre el lenguaje" %></h2>
+    <%= @path.language.description_html %>
+  </div>
+<% end %>
+
+<div>
+  <% if current_user? %>
+    <h2><%= t(:progress) %>
+      <small> <%= @path.stats_for(current_user).passed_ratio %>%</small></h2>
+  <% else %>
+    <h2><%= t(:progress) %>
+      <small> <%= @path.stats_for(current_user).passed_ratio %>%</small></h2>
+  <% end %>
+
+  <% @path.guides.each do |guide| %>
+    <h3><%= guide.position %> <%= link_to_guide guide %></h3>
+    <%= render partial: 'layouts/progress_bar', locals: {guide: guide, stats: guide.stats_for(current_user)} if current_user? %>
+  <% end %>
+</div>
+
+<% if @path.category.links.present? %>
+  <div>
+    <h2><%= "Más información" %></h2>
+    <%= @path.category.links_html %>
+  </div>
+<% end %>
diff --git a/app/views/submissions/index.html.erb b/app/views/submissions/index.html.erb
index 9ae9f3843..fb5510988 100644
--- a/app/views/submissions/index.html.erb
+++ b/app/views/submissions/index.html.erb
@@ -1,41 +1,16 @@
-<div class="row">
-  <div class="navbar navbar-form">
-    <div class="col-md-8">
-      <ul class="nav nav-tabs">
-        <li role="presentation" class="active"><%= link_to t(:my_submissions), submissions_path %></li>
-        <li role="presentation"><%= link_to t(:my_exercises), user_exercises_path(current_user) %></li>
-        <li role="presentation"><%= link_to t(:my_guides), user_guides_path(current_user) %></li>
-      </ul>
-    </div>
-    <div class="col-md-4">
-      <div class="navbar">
-        <%= link_to t('search'), exercises_path, class: 'btn btn-default' %>
-        <%= link_to t('new_guide'), new_guide_path, class: 'btn btn-default' %>
-        <%= link_to t('new_exercise'), new_exercise_path, class: 'btn btn-default' %>
-      </div>
-    </div>
+<%= render layout: 'layouts/user', locals: {current_tab: :recent_activity} do %>
+
+
+  <div>
+    <h2><%= t(:recent_activity) %></h2>
+    <ul>
+      <% @submissions.each do |it| %>
+        <li><%= time_ago_in_words it.updated_at %>: <%= status_icon it %> <%= exercise_breadcrumb it.exercise %></li>
+      <% end %>
+    </ul>
   </div>
-</div>
 
-<table class="table">
-  <thead>
-  <tr>
-    <th><%= t('submission_date') %></th>
-    <th><%= t('exercise') %></th>
-    <th><%= t('output') %></th>
-  </tr>
-  </thead>
+  <%= paginate @submissions %>
 
-  <tbody>
-  <% @submissions.each do |submission| %>
-      <tr>
-        <td><%= status_icon submission %> <%= link_to submission.created_at, [submission.exercise, submission] %></td>
-        <td><%= link_to submission.exercise.title, exercise_path(submission.exercise) %></td>
-        <td><%= submission.result_preview %></td>
-      </tr>
-  <% end %>
-  </tbody>
-</table>
-<%= paginate @submissions %>
-<br>
 
+<% end %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 27f4567ee..dacc0a914 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -29,14 +29,13 @@
   </div>
 
   <div>
-    <h1><%= t(:progress) %></h1>
-
-    <% @user.submitted_guides.group_by(&:path).each do |category, guides| %>
-      <h3><%= category.try(&:name)|| t(:uncategorized) %></h3>
-      <% guides.each do |guide| %>
-        <h3><%= guide.position %> <%= link_to_guide guide %></h3>
-        <%= render partial: 'layouts/progress_bar', locals: { guide: guide, stats: guide.stats(@user) } %>
+    <h2><%= t(:progress) %></h2>
+    <ul>
+      <% @user.submitted_paths.each do |it| %>
+        <li><%= link_to_path it %>: <%= it.stats_for(@user).passed_ratio %>%
+        </li>
       <% end %>
-    <% end %>
+    </ul>
   </div>
+
 <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7d84e29fb..4c82027cd 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -87,12 +87,11 @@ en:
   new_import: Import now!
   new_submission: New Submission
   next_exercise: Next
-  next_guide: Next Guide
+  next_guide: "Next Guide: %{name}"
   no_exercises: Nobody created an exercise for this search yet. <a href="%{create_path}">Be the first!</a>
   no_guides: Nobody created a guide for this search yet. <a href="%{create_path}">Be the first!</a>
   no_permissions: You don't have enough permissions over the repository
   no_submissions: Its seems like you haven't tried to solve this exercise
-  not_started_guide: Which means you haven't started yet. <strong>¡Start practicing now!</strong>
   notify_problem_to_author: Notify problem to author
   output: Output
   overview: Overview
@@ -104,7 +103,7 @@ en:
   problem_with_exercise: '[Mumuki] Problem with exercise: %{title}'
   processing_you_solution: We are processing you solution
   profile_of: Profile of %{username}
-  progress: Exercises
+  progress: Progresss
   refresh_collaborators: Refresh collaborators!
   refresh_or_wait: Please press F5 if results are not displayed after a few seconds
   running: running
@@ -137,3 +136,4 @@ en:
   need_a_hint: "Do you need a hint?"
   about: "About"
   sending_solution: "Sending solution"
+  path_finished: "You have finished this path!"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 893331e8c..5bcf0c525 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1,6 +1,6 @@
 ---
 es:
-  about_this_guide: Sobre esta guía
+  about_this_guide: Introducción
   aborted: Ups, no pudimos evaluar tu solución
   actions: Acciones
   activity: Actividad
@@ -89,12 +89,11 @@ es:
   new_import: ¡Importar ahora!
   new_submission: Nueva Solución
   next_exercise: Siguiente
-  next_guide: Siguiente Guía
+  next_guide: "Siguiente Guía: %{name}"
   no_exercises: Nadie creó un ejercicio para tu búsqueda aún. <a href="%{create_path}">¡Sé el primero!</a>
   no_guides: Nadie creó una guía para tu búsqueda aún. <a href="%{create_path}">¡Sé el primero!</a>
   no_permissions: No tenés suficientes permisos sobre el repositorio
   no_submissions: ¡Parece que aún no intentaste resolver este ejercicio aún!
-  not_started_guide: Eso significa que aún no empezaste con esta guía. <strong>¡Comenzá ahora mismo!</strong>
   notify_problem_to_author: Notificar problema al autor
   output: Salida
   overview: Vista general
@@ -112,7 +111,6 @@ es:
   refresh_or_wait: Si no se muestra automáticamente en unos segundos, presioná F5
   running: procesando
   search: 'Buscá, por ejemplo: polimorfismo, haskell o competenciaDeSaltos'
-  see_next_guides: ¿Querés seguir practicando? ¡tenemos más guías para vos!
   show: Mostrar
   sign_in: Iniciá sesion
   sign_in_action: iniciar sesión
@@ -121,8 +119,8 @@ es:
   sign_out: Cerrar Sesión
   sign_up_date: Usuario desde
   solved_exercises: Ejercicios Resueltos
-  start_practicing: ¡Empezá a practicar!
-  stats: Algunos números
+  start_practicing: ¡Empezá ahora!
+  stats: Tu Progreso
   status: Estado
   stuck_in_guide: Parecería que te está costando un poco despegar con esta guía. ¡<strong>No te desanimes</strong>, es cuestión de práctica y seguir intentando!
   submission: solución
@@ -163,3 +161,7 @@ es:
     classroom: "Dentro y fuera del aula"
     classroom_description: "Ya sea que sea un autodidacta que está buscando aprender a programar en Internet, o un alumno de un curso de programación presencial, Mumuki te será útil"
   uncategorized: "No categorizado"
+  recent_activity: "Actividad Reciente"
+  created_exercises: "Ejercicios Creados"
+  created_guides: "Guías Creadas"
+  path_finished: "¡Terminaste esta categoría! ¡Felicitaciones!"
diff --git a/config/routes.rb b/config/routes.rb
index f3f44e060..7b702f25f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -26,6 +26,8 @@
   root to: 'home#index'
 
   resources :categories, only: :index
+  resources :paths, only: :show
+  resources :submissions, only: :index
 
   # All users
   resources :exercises do
diff --git a/db/migrate/20150724062215_add_language_description.rb b/db/migrate/20150724062215_add_language_description.rb
new file mode 100644
index 000000000..6424dae61
--- /dev/null
+++ b/db/migrate/20150724062215_add_language_description.rb
@@ -0,0 +1,5 @@
+class AddLanguageDescription < ActiveRecord::Migration
+  def change
+    add_column :languages, :description, :text
+  end
+end
diff --git a/db/migrate/20150724062233_add_category_links.rb b/db/migrate/20150724062233_add_category_links.rb
new file mode 100644
index 000000000..5a0e47988
--- /dev/null
+++ b/db/migrate/20150724062233_add_category_links.rb
@@ -0,0 +1,5 @@
+class AddCategoryLinks < ActiveRecord::Migration
+  def change
+    add_column :categories, :links, :text
+  end
+end
diff --git a/db/migrate/20150724062249_add_category_long_description.rb b/db/migrate/20150724062249_add_category_long_description.rb
new file mode 100644
index 000000000..184a7e624
--- /dev/null
+++ b/db/migrate/20150724062249_add_category_long_description.rb
@@ -0,0 +1,5 @@
+class AddCategoryLongDescription < ActiveRecord::Migration
+  def change
+    add_column :categories, :long_description, :text
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 9b0d245dc..2bff7edfd 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150722003532) do
+ActiveRecord::Schema.define(version: 20150724062249) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -64,7 +64,9 @@
     t.string   "image_url"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "position",    default: 0, null: false
+    t.integer  "position",         default: 0, null: false
+    t.text     "links"
+    t.text     "long_description"
   end
 
   create_table "collaborators", force: true do |t|
@@ -164,6 +166,7 @@
     t.integer  "output_content_type",    default: 0
     t.string   "test_extension"
     t.string   "highlight_mode"
+    t.text     "description"
   end
 
   add_index "languages", ["extension"], name: "index_languages_on_extension", using: :btree
@@ -179,6 +182,24 @@
   add_index "paths", ["category_id"], name: "index_paths_on_category_id", using: :btree
   add_index "paths", ["language_id"], name: "index_paths_on_language_id", using: :btree
 
+  create_table "solutions", force: true do |t|
+    t.text     "content"
+    t.integer  "exercise_id"
+    t.integer  "status",              default: 0
+    t.text     "result"
+    t.integer  "submitter_id"
+    t.text     "expectation_results"
+    t.text     "feedback"
+    t.text     "test_results"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "submissions_count",   default: 0, null: false
+    t.string   "submission_id"
+  end
+
+  add_index "solutions", ["exercise_id"], name: "index_solutions_on_exercise_id", using: :btree
+  add_index "solutions", ["submitter_id"], name: "index_solutions_on_submitter_id", using: :btree
+
   create_table "submissions", force: true do |t|
     t.text     "content"
     t.integer  "exercise_id"
diff --git a/db/seeds.rb b/db/seeds.rb
index c17cd97e4..a4f2357c1 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,7 +1,7 @@
-Language.create!(name: 'Haskell',
-                 test_runner_url: 'http://mumuki-hspec-server.herokuapp.com',
-                 extension: 'hs',
-                 image_url: 'https://www.haskell.org/wikistatic/haskellwiki_logo.png')
+haskell = Language.create!(name: 'Haskell',
+                           test_runner_url: 'http://mumuki-hspec-server.herokuapp.com',
+                           extension: 'hs',
+                           image_url: 'https://www.haskell.org/wikistatic/haskellwiki_logo.png')
 
 Language.create!(name: 'Prolog',
                  test_runner_url: 'http://mumuki-plunit-server.herokuapp.com',
@@ -14,11 +14,16 @@
                  image_url: 'https://www.ruby-lang.org/images/header-ruby-logo.png')
 
 Language.create!(name: 'ruby-stones',
-                test_runner_url: 'http://mumuki-ruby-stones-server.herokuapp.com/',
-                extension: 'yml',
-                image_url: 'https://www.ruby-lang.org/images/header-ruby-logo.png')
+                 test_runner_url: 'http://mumuki-ruby-stones-server.herokuapp.com/',
+                 extension: 'yml',
+                 image_url: 'https://www.ruby-lang.org/images/header-ruby-logo.png')
 
 Language.create!(name: 'gobstones',
-                test_runner_url: 'http://mumuki-gobstones-server.herokuapp.com/',
-                extension: 'yml',
-                image_url: 'https://www.ruby-lang.org/images/header-ruby-logo.png')
\ No newline at end of file
+                 test_runner_url: 'http://mumuki-gobstones-server.herokuapp.com/',
+                 extension: 'yml',
+                 image_url: 'https://www.ruby-lang.org/images/header-ruby-logo.png')
+
+
+functional = Category.create!(name: 'Programación Funcional', locale: :es, description: 'Programación Funcional', image_url: 'http://mumuki.io/favicon')
+
+Path.create(category: functional, language: haskell)
diff --git a/spec/features/i18n_spec.rb b/spec/features/i18n_spec.rb
index e3e54826d..55fa0970c 100644
--- a/spec/features/i18n_spec.rb
+++ b/spec/features/i18n_spec.rb
@@ -4,7 +4,7 @@
   scenario 'search from home, in spanish' do
     visit '/?locale=es'
 
-    expect(page).to have_link('Empezá a practicar!', href: '/categories?locale=es')
+    expect(page).to have_link('Empezá ahora!', href: '/categories?locale=es')
 
     visit '/guides?locale=es'
     expect(page).to have_text('Nadie creó una guía para tu búsqueda aún')
diff --git a/spec/features/progress_flow_spec.rb b/spec/features/progress_flow_spec.rb
new file mode 100644
index 000000000..423eff139
--- /dev/null
+++ b/spec/features/progress_flow_spec.rb
@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+feature 'Progress Flow' do
+  let!(:user) { create(:user) }
+  let!(:functional) { create(:category, name: 'Functional Programming') }
+  let!(:haskell) { create(:haskell) }
+  let!(:functional_haskell) { create(:path, language: haskell, category: functional) }
+  let!(:first_guide) { create(:guide, path: functional_haskell, name: 'HS Functional Programming First Guide', position: 1) }
+  let!(:exercise) { create(:exercise, guide: first_guide) }
+
+
+  scenario 'user progress, not logged in, no submissions' do
+    visit "/users/#{user.id}"
+
+    expect(page).to have_text('Progress')
+    expect(page).to_not have_text('Functional Programming')
+  end
+
+  scenario 'user progress, not logged in, with submissions' do
+    exercise.submissions.create!(submitter: user, content: 'foo', status: :failed)
+
+    visit "/users/#{user.id}"
+
+    expect(page).to have_text('Progress')
+    expect(page).to have_text('Functional Programming')
+  end
+
+  scenario 'path progress, logged in' do
+    visit '/'
+    click_on 'Sign in with Github'
+
+    visit "/paths/#{functional_haskell.id}"
+
+    expect(page).to have_text('Progress')
+    expect(page).to have_text('Functional Programming')
+    expect(page).to have_text('HS Functional Programming First Guide')
+  end
+
+  scenario 'path progress, not logged in' do
+    visit "/paths/#{functional_haskell.id}"
+
+    expect(page).to have_text('You must sign in before continue')
+  end
+
+end
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 08514f9de..5794c6cc1 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -40,14 +40,14 @@
 
     context 'when guide has no suggestions' do
       let(:guide) { create(:guide, position: 1, path: path) }
-      it { expect(next_guides_box(guide)).to be nil }
+      it { expect(next_guides_box(guide)).to eq 'You have finished this path!' }
     end
 
     context 'when guide has one suggestion' do
       let!(:suggested_guide) { create(:guide, position: 2, path: path) }
       let(:guide) { create(:guide, position: 1, path: path) }
 
-      it { expect(next_guides_box(guide)).to eq "<a class=\"btn btn-success\" href=\"/guides/#{suggested_guide.id}\">Next Guide</a>" }
+      it { expect(next_guides_box(guide)).to include "<a class=\"btn btn-success\" href=\"/guides/#{suggested_guide.id}\">Next Guide: #{suggested_guide.name}</a>" }
     end
 
     context 'when guide has many suggestions' do
@@ -55,7 +55,7 @@
       let!(:suggested_guide_2) { create(:guide, position: 2, path: path) }
       let(:guide) { create(:guide, position: 1, path: path) }
 
-      it { expect(next_guides_box(guide)).to include "<li class=\"list-group-item\"><a href=\"/guides/#{suggested_guide_1.id}\">#{suggested_guide_1.name}" }
+      it { expect(next_guides_box(guide)).to include "<a class=\"btn btn-success\" href=\"/guides/#{suggested_guide_1.id}\">Next Guide: #{suggested_guide_1.name}</a>" }
       it { expect(next_guides_box(guide)).to be_html_safe } end
   end
 
diff --git a/spec/helpers/with_breadcrumbs_spec.rb b/spec/helpers/with_breadcrumbs_spec.rb
new file mode 100644
index 000000000..d35992f18
--- /dev/null
+++ b/spec/helpers/with_breadcrumbs_spec.rb
@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe WithBreadcrumbs do
+
+  helper WithBreadcrumbs
+  helper WithLinksRendering
+
+  let(:breadcrumb) { exercise_breadcrumb(exercise) }
+
+  context 'standalone exercise' do
+    let(:exercise) { create(:exercise, title: 'my exercise') }
+    it { expect(breadcrumb).to include('my exercise') }
+    it { expect(breadcrumb).to be_html_safe }
+
+  end
+  context 'exercise in guide' do
+    let(:exercise) { create(:exercise, title: 'my exercise', guide: guide, position: 1) }
+    let(:guide) { create(:guide, name: 'my guide') }
+
+    it { expect(breadcrumb).to include('my exercise') }
+    it { expect(breadcrumb).to include('my guide') }
+    it { expect(breadcrumb).to be_html_safe }
+  end
+
+  context 'exercise in path' do
+    let(:exercise) { create(:exercise, title: 'my exercise', guide: guide, position: 1) }
+    let(:guide) { create(:guide, name: 'my guide', path: path, position: 1) }
+    let(:path) { create(:path, category: category) }
+    let(:category) { create(:category, name: 'my category') }
+
+    it { expect(breadcrumb).to include('my exercise') }
+    it { expect(breadcrumb).to include('my guide') }
+    it { expect(breadcrumb).to include('my category') }
+    it { expect(breadcrumb).to be_html_safe }
+
+  end
+end
diff --git a/spec/models/stats_spec.rb b/spec/models/stats_spec.rb
index 92e82adfb..71c79af10 100644
--- a/spec/models/stats_spec.rb
+++ b/spec/models/stats_spec.rb
@@ -5,6 +5,7 @@
   context 'with good stats' do
     let(:stats) { Stats.new(passed: 6, passed_with_warnings: 3, failed: 1, unknown: 0) }
     it { expect(stats.passed_ratio).to eq 60 }
+    it { expect(stats.resolved_ratio).to eq 90 }
     it { expect(stats.passed_with_warnings_ratio).to eq 30 }
     it { expect(stats.failed_ratio).to eq 10 }
     it { expect(stats.resolved).to eq 9 }
@@ -14,6 +15,13 @@
   end
 
 
+  context 'with irrational stats' do
+    let(:stats) { Stats.new(passed: 1, passed_with_warnings: 0, failed: 2, unknown: 0) }
+    it { expect(stats.passed_ratio).to eq 33.33 }
+    it { expect(stats.failed_ratio).to eq 66.67 }
+  end
+
+
   context 'with bad stats' do
     let(:stats) { Stats.new(passed: 1, passed_with_warnings: 0, failed: 4, unknown: 5) }
     it { expect(stats.passed_ratio).to eq 10 }