diff --git a/pinaxcon/templates/dashboard.html b/pinaxcon/templates/dashboard.html
index fe99750d..804f4ee4 100644
--- a/pinaxcon/templates/dashboard.html
+++ b/pinaxcon/templates/dashboard.html
@@ -1,4 +1,4 @@
-{% extends "utility_page.html" %}
+{% extends "site_base.html" %}
{% load staticfiles %}
{% load i18n %}
{% load proposal_tags %}
@@ -10,8 +10,7 @@
{% block head_title %}Dashboard{% endblock %}
-{% block header_lead %}User Dashboard{% endblock %}
-{% block main_class %}{% endblock %}
+{% block page_title %}User Dashboard{% endblock %}
{% block alert %}
{% endblock %}
@@ -19,21 +18,17 @@
{% block content %}
{% available_categories as categories %}
-
-
Dashboard
-
-
{% if categories %}
{% include "symposion/dashboard/_categories.html" %}
{% endif %}
-
+
{% include "symposion/dashboard/speaking.html" %}
{% if user.speaker_profile %}
{% if user.speaker_profile.proposals.exists %}
-
+
Your Proposals
@@ -56,7 +51,7 @@
{% associated_proposals as associated_proposals %}
{% pending_proposals as pending_proposals %}
{% if associated_proposals or pending_proposals %}
-
+
Copresenter Proposals
@@ -75,13 +70,19 @@
{% endif %}
{% if review_sections %}
-
-
-
{% trans "Reviews" %}
- {% for section in review_sections %}
-
-
{% available_teams as available_teams %}
{% if user.memberships.exists or available_teams %}
-
+
{% trans "Teams "%}
- {% if user.memberships.exists %}
-
+
+ {% if user.memberships.exists %}
Your Teams
{% for membership in user.memberships.all %}
- {% include "symposion/teams/_team_row.html" with team=membership.team %}
- {% endfor %}
+ {% include "symposion/teams/_team_row.html" with team=membership.team %}
+ {% endfor %}
- {% endif %}
-
-
-
+ {% endif %}
+ {% if available_teams %}
- {% if available_teams %}
-
Available Teams
+ Available Teams
-
+
- {% for team in available_teams %}
+ {% for team in available_teams %}
{% include "symposion/teams/_team_row.html" %}
- {% endfor %}
+ {% endfor %}
-
- {% endif %}
+ {% endif %}
{% endif %}
diff --git a/pinaxcon/templates/site_base.html b/pinaxcon/templates/site_base.html
index 210f316c..b172663a 100644
--- a/pinaxcon/templates/site_base.html
+++ b/pinaxcon/templates/site_base.html
@@ -98,7 +98,7 @@
{% endblock %}
-