diff --git a/app/client/views/patients/patient_visit.coffee b/app/client/views/patients/patient_visit.coffee
index c057ce8..8cb54b7 100644
--- a/app/client/views/patients/patient_visit.coffee
+++ b/app/client/views/patients/patient_visit.coffee
@@ -1,64 +1,65 @@
 AutoForm.hooks
   uploadPhysioRecordForm:
     onSubmit: (insertDoc, updateDoc, currentDoc) ->
       metadata =
         visitId: currentDoc._id
         sensor: insertDoc.sensor
         deviceName: insertDoc.deviceName
       self = @
       Meteor.call "updatePhysioRecordMetadata", insertDoc.physioRecordId, metadata, (error) ->
         self.done()
         throwError error if error?
       false
 
 Template.patientVisit.helpers
   #this templateData
   visit: ->
     v = Visits.findOne(@visitId)
     if v?
       v.validatedDoc()
     else v
 
+  #with questionnaire=this visit=.. patient=../../patient
+  questionnaireCSS: ->
+    return "valid" if @questionnaire.answered
+    "invalid"
+
   #this visit
   showEmpaticaRecorder: ->
     @recordPhysicalData and Meteor.isCordova
 
   #this visit
   empaticaSessionId: ->
     @_id
     
   #this visit
   uploadFormSchema: ->
     schema =
       sensor:
         type: String
         label: "Sensor"
       deviceName:
         type: String
         label: "Device name"
         optional: true
       physioRecordId:
         type: String
         label: " "
         autoform:
           afFieldInput:
             type: 'fileUpload'
             collection: 'PhysioRecords'
             label: 'Choose file'
     new SimpleSchema(schema)
   
 
-Template.questionnaireRow.helpers
-  questionnaireCSS: ->
-    return "valid" if @questionnaire.answered
-    "invalid"
-
-Template.questionnaireRow.events
-  #this: {questionnaire, visit, patient}
+Template.patientVisit.events
+  #with questionnaire=this visit=.. patient=../../patient
   "click .answerQuestionnaire": (evt, tmpl) ->
     Modal.show('questionnaireWizzard', @)
     false
 
+  #this: {questionnaire, visit, patient}
   "click .showQuestionnaire": (evt, tmpl) ->
     Modal.show('viewQuestionnaire', @)
     false
diff --git a/app/client/views/patients/patient_visit.html b/app/client/views/patients/patient_visit.html
index 9465f6d..fc2e176 100644
--- a/app/client/views/patients/patient_visit.html
+++ b/app/client/views/patients/patient_visit.html
@@ -1,76 +1,74 @@
 <template name="patientVisit">
 <div id="visit">
   {{#with visit}}
     <div class="header">
       <h3 class="pull-left">
         {{title}} <small>{{_id}}</small>
       </h3>
     </div>
     <div class="row">
       <div class="questionnaires col-xs-12 col-md-6">
         <h4>Questionnaires <i class="fa fa-file-text-o"></i></h4>
         <table class="table">
         {{#each validatedQuestionnaires}}
-          {{> questionnaireRow questionnaire=this visit=.. patient=../../patient}}
+          {{#with questionnaire=this visit=.. patient=../../patient}}
+            <tr>
+              <td class="{{questionnaireCSS}}">{{questionnaire.title}}</td>
+              <td class="{{questionnaireCSS}}">{{percentage questionnaire.numQuestions questionnaire.numAnswered}}</td>
+              <!--
+              <td class="cursorPointer showQuestionnaire"><i class="fa fa-lg fa-list"></i></td>
+              -->
+              <td class="cursorPointer answerQuestionnaire"><i class="fa fa-lg fa-pencil-square-o"></i></td>
+            </tr>
+          {{/with}}
         {{else}}
           No questionnaires are scheduled for this visit.
         {{/each}}
         </table>
       </div>
       <div class="physiologicalData col-xs-12 col-md-6">
         <h4>Physiological data <i class="fa fa-heartbeat"></i></h4>
         {{#if recordPhysicalData}}
           {{#if showEmpaticaRecorder}}
             {{> empaticaRecorder sessionId=empaticaSessionId}}
           {{/if}}
           <h5>Records</h5>
           <table class="table condensed">
           {{#each physioRecords}}
             <tr>
               <td>{{metadata.sensor}}</td>
               <td>{{fileSizeSani size}}</td>
               <td><a href="{{this.url}}" target="_blank"><i class="fa fa-download"></i></a></td>
             </tr>
           {{else}}
             no records found.
           {{/each}}
           </table>
           <div class="panel panel-default">
             <div class="panel-heading collapsed cursorPointer" data-toggle="collapse" data-target="#uploadPhysioRecords">
               <h3 class="panel-title panel-title-inline">
                 <a class="accordion-toggle collapsed" >
                   upload records manually
                 </a>
               </h3>
             </div>
             <div id="uploadPhysioRecords" class="panel-collapse collapse">
               <div class="panel-body">
                 {{#autoForm doc=this schema=uploadFormSchema id="uploadPhysioRecordForm" type="normal" class="uploadPhysioRecordForm"}}
                   {{#each afFieldNames}}
                     {{> afQuickField name=this.name options=afOptionsFromSchema}}
                   {{/each}}
                   <button type="submit" class="btn btn-primary pull-right">Save</button>
                   <button type="reset" class="btn btn-danger">Reset</button>
                 {{/autoForm}}
               </div>
             </div>
           </div>
         {{else}}
           Recording physical data is not scheduled for this visit.
         {{/if}}
       </div>
     </div>
   {{/with}}
 </div>
 </template>
-
-<template name="questionnaireRow">
-<tr>
-  <td class="{{questionnaireCSS}}">{{questionnaire.title}}</td>
-  <td class="{{questionnaireCSS}}">{{percentage questionnaire.numQuestions questionnaire.numAnswered}}</td>
-  <!--
-  <td class="cursorPointer showQuestionnaire"><i class="fa fa-lg fa-list"></i></td>
-  -->
-  <td class="cursorPointer answerQuestionnaire"><i class="fa fa-lg fa-pencil-square-o"></i></td>
-</tr>
-</template>