diff --git a/rowers/templates/panel_notes.html b/rowers/templates/panel_notes.html
new file mode 100644
index 00000000..fb6cd880
--- /dev/null
+++ b/rowers/templates/panel_notes.html
@@ -0,0 +1,6 @@
+<h2>Notes</h2>
+<p>
+  <div class="wrapwords">
+    {{ workout.notes }}
+  </div>
+</p>
diff --git a/rowers/templates/panel_shortcomment.html b/rowers/templates/panel_shortcomment.html
new file mode 100644
index 00000000..6774494b
--- /dev/null
+++ b/rowers/templates/panel_shortcomment.html
@@ -0,0 +1,13 @@
+{% load rowerfilters %}
+{% load tz %}
+  <div class="grid_6 suffix_3 alpha">
+  <table width=100%>
+    <tr>
+      <th>Comments</th>
+      <td>
+          <a href="/rowers/workout/{{ workout.id }}/comment">Comment ({{ aantalcomments }})</a>
+      </td>
+      
+    </tr>
+  </table>
+  </div>
diff --git a/rowers/templates/plannedsessionview.html b/rowers/templates/plannedsessionview.html
index b704261a..e77d4add 100644
--- a/rowers/templates/plannedsessionview.html
+++ b/rowers/templates/plannedsessionview.html
@@ -33,15 +33,15 @@
 <div class="grid_12 alpha">
 <div id="left" class="grid_6 alpha">
   <h1>Session {{ psdict.name.1 }}</h1>
-  <table class="listtable shortpadded" width="80%">
+  <table class="listtable shortpadded" width="95%">
     {% for attr in attrs %}
     {% for key,value in psdict.items %}
     {% if key == attr %}
     <tr>
       {% if key == 'comment' %}
-      <td><b>{{ value.0 }}</b></td><td>{{ value.1|linebreaks }}</td>
+      <td><b>{{ value.0 }}</b></td><td class="wrapwords">{{ value.1|linebreaks }}</td>
       {% else %}
-      <td><b>{{ value.0 }}</b></td><td>{{ value.1 }}</td>
+      <td><b>{{ value.0 }}</b></td><td class="wrapwords">{{ value.1 }}</td>
       {% endif %}
     </tr>
     {% endif %}
diff --git a/rowers/utils.py b/rowers/utils.py
index 003a41ab..e1588ffe 100644
--- a/rowers/utils.py
+++ b/rowers/utils.py
@@ -22,6 +22,8 @@ workflowmiddlepanel = (
     ('panel_summary.html','Summary'),
     ('panel_map.html','Map'),
     ('panel_comments.html','Basic Info and Links'),
+    ('panel_notes.html','Workout Notes'),
+    ('panel_shortcomment.html','Comment Link'),
     ('panel_middlesocial.html','Social Media Share Buttons'),
     )
 
diff --git a/rowers/views.py b/rowers/views.py
index 5eb16dc4..2c565621 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -6194,6 +6194,7 @@ def workouts_view(request,message='',successmessage='',
                   startdate=timezone.now()-datetime.timedelta(days=365),
                   enddate=timezone.now()+datetime.timedelta(days=1),
                   teamid=0,rankingonly=False,rowerid=0,userid=0):
+
     request.session['referer'] = absolute(request)['PATH']
     try:
         if rowerid != 0:
@@ -6259,7 +6260,7 @@ def workouts_view(request,message='',successmessage='',
         if theteam.viewing == 'allmembers' or theteam.manager == request.user:
             workouts = Workout.objects.filter(team=theteam,
                                           startdatetime__gte=startdate,
-                                          startdatetime__lte=enddate).order_by("-startdatetime")
+                                          startdatetime__lte=enddate).order_by("-date","-starttime")
             g_workouts = Workout.objects.filter(team=theteam,
                                                 startdatetime__gte=activity_startdate,
                                                 startdatetime__lte=activity_enddate).order_by("-date", "-starttime")
diff --git a/static/css/rowsandall.css b/static/css/rowsandall.css
index f8d66d68..60918ee3 100644
--- a/static/css/rowsandall.css
+++ b/static/css/rowsandall.css
@@ -841,3 +841,17 @@ a.wh:hover {
   color: #000;
 
 }
+
+.wrapwords{
+    -ms-word-break: break-all;
+    word-break: break-all;
+
+    /* Non standard for webkit */
+    word-break: break-word;
+
+    -webkit-hyphens: auto;
+    -moz-hyphens: auto;
+    -ms-hyphens: auto;
+    hyphens: auto;
+
+}