diff --git a/src/outpatient/app/view/patient/more.js b/src/outpatient/app/view/patient/more.js
index 851f0836..91835ab7 100644
--- a/src/outpatient/app/view/patient/more.js
+++ b/src/outpatient/app/view/patient/more.js
@@ -26,7 +26,7 @@ Ext.define('RaxaEmr.Outpatient.view.patient.more', {
         layout: 'vbox',
         items: [{
             id: 'content',
-            tpl: ['<div class="top">', '<div style="float:left;width:50%;">', '<div class="headshot" style="float:left;background-image:url({image});">', '</div>', '<div class="name" style="float:left;width:80%;">', '{display}', '</br>', '<span>From : -- </span>', '</br>', '</div>', '</div>', '<div style="float:left;width:50%;">', '<div class="name_small" style="float:left;width:50%;">', '<span> Age : {age} </span>', '<span>ID : --</span>', '</br>', '</div>', '<div class="name_right" style="float:left;width:50%;">', '<h3>--</h3>', '<span></span>', '</div>', '</div>', '</div>'].join('')
+            tpl: ['<div class="top">', '<div style="float:left;width:50%;">', '<div class="headshot" style="float:left;background-image:url(resources/images/default_image.png);float:left;height:40px;width:48px;;">', '</div>', '<div class="name" style="float:left;width:80%;">', '{display}', '</br>', '<span>From : -- </span>', '</br>', '</div>', '</div>', '<div style="float:left;width:50%;">', '<div class="name_small" style="float:left;width:50%;">', '<span> Age : {age} </span>', '<span>ID : --</span>', '</br>', '</div>', '<div class="name_right" style="float:left;width:50%;">', '<h3>--</h3>', '<span></span>', '</div>', '</div>', '</div>'].join('')
         }, {
             xtype: 'vitalsGrid',
             height: 84
diff --git a/src/outpatient/app/view/patientlist.js b/src/outpatient/app/view/patientlist.js
index 9f0e2f15..ddfbdc73 100644
--- a/src/outpatient/app/view/patientlist.js
+++ b/src/outpatient/app/view/patientlist.js
@@ -92,17 +92,20 @@ Ext.define('RaxaEmr.Outpatient.view.patientlist', {
         }],
 		//list items  are shown by this
 		itemTpl: new Ext.XTemplate(
-			'<div class="headshot" style="background-image:url({image});"></div>', '<div style="float:left;width:25%;">', '{display}', '<span>Gender : {[this.gender(values.gender)]}</span>', '<span>From : ----</span>', '</div>', '<div style="float:left;width:25%;">', '<span>----</span>', '<span>Disease : ----</span>', '<span>Age : {age}</span>', '</div>', '<div style="float:left;height:32px;width:32px;background-image:url(resources/images/urgency.png);">8</div>', '<div style="float:right;width:25%;">', '<span>Last Visit : ----</span>', '<span>No. of Visits : --</span>', '<span>ID : ----</span>', '</div>',
+			'<div class="headshot" style="background-image:url(resources/images/default_image.png);float:left;height:40px;width:48px;"></div>', '<div style="float:left;width:25%;">', '{display}', '<span>Gender : {[this.gender(values.gender)]}</span>', '<span>From : ----</span>', '</div>', '<div style="float:left;width:25%;">', '<span>----</span>', '<span>Disease : ----</span>', '<span>Age : {age}</span>', '</div>', '<div style="float:left;height:32px;width:32px;background-image:url(resources/images/urgency.png);">8</div>', '<div style="float:right;width:25%;">', '<span>Last Visit : ----</span>', '<span>No. of Visits : --</span>', '<span>ID : ----</span>', '</div>',
 			{
 				date: function(str){
                     return str.encounters[0].encounterDatetime.split("T")[0];
 				},
 				gender: function(str){
-					if(str == 'M'){
+					if(str == 'Male'){
 						return 'Male';
-					}else if(str == 'F'){
-                        return 'Female';
-					}
+					}else if(str == 'Female'){
+                                                    return 'Female';
+                                                }
+                                                else if (str == 'Other'){
+                                                    return '----';
+                                                }                            					
 				  }
 			}
 		)
diff --git a/src/outpatient/resources/images/default_image.png b/src/outpatient/resources/images/default_image.png
new file mode 100644
index 00000000..60e64873
Binary files /dev/null and b/src/outpatient/resources/images/default_image.png differ
diff --git a/src/pharmacy/app/controller/prescription.js b/src/pharmacy/app/controller/prescription.js
index be9421c0..7567f391 100644
--- a/src/pharmacy/app/controller/prescription.js
+++ b/src/pharmacy/app/controller/prescription.js
@@ -381,7 +381,27 @@ Ext.define("RaxaEmr.Pharmacy.controller.prescription", {
             }
         }
         localStorage.setItem('selectedPatient', JSON.stringify(selectedPatient));
-        var printWindow = window.open('app/print.html', 'Fill Prescription', 'height=500,width=1100,resizable=yes,scrollbars=yes,toolbar=yes,menubar=no,location=no,directories=no,status=yes');
+        
+        // Checking DrugName and Quantity are enetered for each row entered.
+        var qtyanddrugNameFlag=0;     // Flag to check for empty entries for either drugname or quantity         
+        for (var i=0;i<selectedPatient['DrugGrid'].length;i++){
+            if (selectedPatient['DrugGrid'][i].drugName=="" && selectedPatient['DrugGrid'][i].qty==0){
+                // To remove empty rows.
+            }            
+            else {
+                if (selectedPatient['DrugGrid'][i].drugName=="" || selectedPatient['DrugGrid'][i].qty==0){
+                    qtyanddrugNameFlag++;
+                }
+            }
+        }
+        
+          if (selectedPatient['DrugGrid'].length==0 || qtyanddrugNameFlag!=0) {
+               Ext.Msg.alert("Invalid","Please enter drug and corresponding quantity."); 
+            }
+        else{                         
+                     var printWindow = window.open('app/print.html', 'Fill Prescription', 'height=500,width=1100,resizable=yes,scrollbars=yes,toolbar=yes,menubar=no,location=no,directories=no,status=yes');
+            }
+                
     },
     readGrid: function() {
         var drugs = Ext.getStore('orderStore').data;