=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/DefaultPatientAttributeValueService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/DefaultPatientAttributeValueService.java	2009-11-12 11:27:02 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/DefaultPatientAttributeValueService.java	2009-11-19 19:31:31 +0000
@@ -36,7 +36,6 @@
 
 import org.hisp.dhis.patient.Patient;
 import org.hisp.dhis.patient.PatientAttribute;
-import org.hisp.dhis.patient.PatientService;
 import org.springframework.transaction.annotation.Transactional;
 
 /**

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/aggregation/DefaultPatientDataValueAggregationEngine.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/aggregation/DefaultPatientDataValueAggregationEngine.java	2009-09-30 15:03:55 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/aggregation/DefaultPatientDataValueAggregationEngine.java	2009-11-19 19:31:31 +0000
@@ -16,6 +16,7 @@
 
 // Work in progress!
 
+@SuppressWarnings( "unused" )
 public class DefaultPatientDataValueAggregationEngine
     implements PatientDataValueAggregationEngine
 {
@@ -72,12 +73,7 @@
         
         Collection<Integer> patients = null; // patientService.getPatients( OrganisationUnit organisationUnit );
 
-        Collection<Period> periods = periodService.getPeriodsBetweenDates( startDate, endDate );
-            
-        for ( DataElement dataElement : dataElements )
-        {
-            
-        }
+        Collection<Period> periods = periodService.getPeriodsBetweenDates( startDate, endDate );            
     }
     
     private void aggregate( DataElement dataElement, Collection<Integer> categoryOptionCombos, Period period, Collection<Integer> patients )

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/NoAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/NoAction.java	2009-10-06 13:49:47 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/NoAction.java	2009-11-19 19:31:31 +0000
@@ -38,8 +38,6 @@
     public String execute()
         throws Exception
     {
-
         return SUCCESS;
-
     }
 }
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/DataEntryAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/DataEntryAction.java	2009-11-13 15:59:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/DataEntryAction.java	2009-11-19 19:31:31 +0000
@@ -54,7 +54,6 @@
 public class DataEntryAction
     implements Action
 {
-
     // -------------------------------------------------------------------------
     // Dependencies
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/DataRecordingSelectAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/DataRecordingSelectAction.java	2009-11-12 16:47:23 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/DataRecordingSelectAction.java	2009-11-19 19:31:31 +0000
@@ -53,7 +53,6 @@
 public class DataRecordingSelectAction
     implements Action
 {
-
     private static final String DATAENTRY_FORM = "dataentryform";
 
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetPatientAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetPatientAction.java	2009-10-28 19:47:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetPatientAction.java	2009-11-19 19:31:31 +0000
@@ -49,7 +49,6 @@
 public class GetPatientAction
     implements Action
 {
-
     // -------------------------------------------------------------------------
     // Dependencies
     // -------------------------------------------------------------------------

=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/NoAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/NoAction.java	2009-10-28 19:47:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/NoAction.java	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2004-2009, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- *   be used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.caseentry.action.caseentry;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Abyot Asalefew Gizaw
- * @version $Id$
- */
-public class NoAction
-    implements Action
-{
-    public String execute()
-        throws Exception
-    {
-
-        return SUCCESS;
-
-    }
-}
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveDateValueAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveDateValueAction.java	2009-11-13 15:59:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveDateValueAction.java	2009-11-19 19:31:31 +0000
@@ -56,7 +56,6 @@
 public class SaveDateValueAction
     implements Action
 {
-
     private static final Log LOG = LogFactory.getLog( SaveDateValueAction.class );
 
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveExecutionDateAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveExecutionDateAction.java	2009-10-28 19:47:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveExecutionDateAction.java	2009-11-19 19:31:31 +0000
@@ -43,7 +43,6 @@
 public class SaveExecutionDateAction
     implements Action
 {
-
     private static final Log LOG = LogFactory.getLog( SaveExecutionDateAction.class );
 
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveProvidingFacilityAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveProvidingFacilityAction.java	2009-10-28 19:47:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveProvidingFacilityAction.java	2009-11-19 19:31:31 +0000
@@ -53,7 +53,6 @@
 public class SaveProvidingFacilityAction
     implements Action
 {
-
     private static final Log LOG = LogFactory.getLog( SaveProvidingFacilityAction.class );
 
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveValueAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveValueAction.java	2009-11-13 15:59:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveValueAction.java	2009-11-19 19:31:31 +0000
@@ -56,7 +56,6 @@
 public class SaveValueAction
     implements Action
 {
-
     private static final Log LOG = LogFactory.getLog( SaveValueAction.class );
 
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SearchPatientAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SearchPatientAction.java	2009-11-14 14:29:33 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SearchPatientAction.java	2009-11-19 19:31:31 +0000
@@ -49,7 +49,6 @@
 public class SearchPatientAction
     implements Action
 {
-
     // -------------------------------------------------------------------------
     // Dependencies
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SearchPatientFormAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SearchPatientFormAction.java	2009-10-28 19:47:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SearchPatientFormAction.java	2009-11-19 19:31:31 +0000
@@ -43,7 +43,6 @@
 public class SearchPatientFormAction
     implements Action
 {
-
     // -------------------------------------------------------------------------
     // Dependencies
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateReportAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateReportAction.java	2009-11-12 16:47:23 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateReportAction.java	2009-11-19 19:31:31 +0000
@@ -28,9 +28,7 @@
 package org.hisp.dhis.caseentry.action.report;
 
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.Collection;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -54,10 +52,8 @@
 public class GenerateReportAction
     implements Action
 {
-
-    private static final String RED = "#ff0000";
-
-    private static final String YELLOW = "#ffff00";
+    public static final String RED = "#ff0000";
+    public static final String YELLOW = "#ffff00";
 
     // -------------------------------------------------------------------------
     // Dependencies

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/visitplan/VisitPlanAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/visitplan/VisitPlanAction.java	2009-11-13 15:59:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/visitplan/VisitPlanAction.java	2009-11-19 19:31:31 +0000
@@ -57,7 +57,6 @@
 public class VisitPlanAction
     implements Action
 {
-
     // -------------------------------------------------------------------------
     // Dependencies
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/state/DefaultSelectedStateManager.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/state/DefaultSelectedStateManager.java	2009-11-14 14:29:33 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/state/DefaultSelectedStateManager.java	2009-11-19 19:31:31 +0000
@@ -47,17 +47,11 @@
 public class DefaultSelectedStateManager
     implements SelectedStateManager
 {
-
     public static final String SESSION_KEY_SELECTED_PATIENT_ID = "selected_patient_id";
-
     public static final String SESSION_KEY_SELECTED_PROGRAM_ID = "selected_program_id";
-
     public static final String SESSION_KEY_SELECTED_PROGRAMSTAGE_ID = "selected_program_stage_id";
-
     public static final String SESSION_KEY_LISTALL = "list_all_value";
-
     public static final String SESSION_KEY_SELECTED_SEARCHING_ATTRIBUTE_ID = "selected_searching_attribute_id";
-
     public static final String SESSION_KEY_SPECIFIED_SEARCH_TEXT = "specified_search_text";
 
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryMenu.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryMenu.vm	2009-11-08 14:29:45 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryMenu.vm	2009-11-19 19:31:31 +0000
@@ -1,7 +1,7 @@
 
-<a href="index.action"><h2>$i18n.getString( "data_entry_and_reports" )</h2></a>
+<a href="index.action"><h2>$i18n.getString( "data_entry_and_reports" )&nbsp;</h2></a>
 <ul>
-	<li><a href="dataEntrySelect.action">$i18n.getString( "data_entry" )</a></li>
+	<li><a href="dataEntrySelect.action">$i18n.getString( "data_entry" )&nbsp;</a></li>
 </ul>
 
 <br>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm	2009-11-08 14:29:45 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm	2009-11-19 19:31:31 +0000
@@ -1,13 +1,13 @@
 
 <h2>$i18n.getString( "data_entry" )&nbsp;</h2>
 <ul>
-    <li><a href="dataEntrySelect.action">$i18n.getString( "data_entry" )</a></li>
+    <li><a href="dataEntrySelect.action">$i18n.getString( "data_entry" )&nbsp;</a></li>
 </ul>
 
 <h2>$i18n.getString( "reports" )&nbsp;</h2>
 <ul>
-    <li><a href="reportSelect.action">$i18n.getString( "summary_report" )</a></li>     
-    <li><a href="visitPlanSelect.action">$i18n.getString( "visit_plan" )</a></li>    
+    <li><a href="reportSelect.action">$i18n.getString( "summary_report" )&nbsp;</a></li>     
+    <li><a href="visitPlanSelect.action">$i18n.getString( "visit_plan" )&nbsp;</a></li>    
 </ul>
 
 <br>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportsMenu.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportsMenu.vm	2009-11-08 14:29:45 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportsMenu.vm	2009-11-19 19:31:31 +0000
@@ -1,8 +1,8 @@
 
-<a href="index.action"><h2>$i18n.getString( "data_entry_and_reports" )</h2></a>
+<a href="index.action"><h2>$i18n.getString( "data_entry_and_reports" )&nbsp;</h2></a>
 <ul>
-    <li><a href="visitPlanSelect.action">$i18n.getString( "visit_plan" )</a></li>
-    <li><a href="reportSelect.action">$i18n.getString( "reports" )</a></li>
+    <li><a href="visitPlanSelect.action">$i18n.getString( "visit_plan" )&nbsp;</a></li>
+    <li><a href="reportSelect.action">$i18n.getString( "reports" )&nbsp;</a></li>
 </ul>
 
 <br>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml	2009-11-14 14:29:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml	2009-11-19 19:31:31 +0000
@@ -16,8 +16,7 @@
   
   <!-- RelationshipType -->
   
-  <bean
-    id="org.hisp.dhis.patient.action.relationship.GetRelationshipTypeListAction"
+  <bean id="org.hisp.dhis.patient.action.relationship.GetRelationshipTypeListAction"
     class="org.hisp.dhis.patient.action.relationship.GetRelationshipTypeListAction"
     scope="prototype">
     <property name="relationshipTypeService"
@@ -38,24 +37,21 @@
       ref="org.hisp.dhis.relationship.RelationshipTypeService"/>
   </bean>
   
-  <bean
-    id="org.hisp.dhis.patient.action.relationship.RemoveRelationshipTypeAction"
+  <bean id="org.hisp.dhis.patient.action.relationship.RemoveRelationshipTypeAction"
     class="org.hisp.dhis.patient.action.relationship.RemoveRelationshipTypeAction"
     scope="prototype">
     <property name="relationshipTypeService"
       ref="org.hisp.dhis.relationship.RelationshipTypeService"/>
   </bean>
   
-  <bean
-    id="org.hisp.dhis.patient.action.relationship.UpdateRelationshipTypeAction"
+  <bean id="org.hisp.dhis.patient.action.relationship.UpdateRelationshipTypeAction"
     class="org.hisp.dhis.patient.action.relationship.UpdateRelationshipTypeAction"
     scope="prototype">
     <property name="relationshipTypeService"
       ref="org.hisp.dhis.relationship.RelationshipTypeService"/>
   </bean>
   
-  <bean
-    id="org.hisp.dhis.patient.action.relationship.ValidateRelationshipTypeAction"
+  <bean id="org.hisp.dhis.patient.action.relationship.ValidateRelationshipTypeAction"
     class="org.hisp.dhis.patient.action.relationship.ValidateRelationshipTypeAction"
     scope="prototype">
   </bean>
@@ -92,8 +88,7 @@
       ref="org.hisp.dhis.patientattributevalue.PatientAttributeValueService"/>
   </bean>
   
-  <bean
-    id="org.hisp.dhis.patient.action.relationship.ShowAddRelationshipFormAction"
+  <bean id="org.hisp.dhis.patient.action.relationship.ShowAddRelationshipFormAction"
     class="org.hisp.dhis.patient.action.relationship.ShowAddRelationshipFormAction"
     scope="prototype">
     <property name="relationshipTypeService"

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm	2009-11-11 00:05:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm	2009-11-19 19:31:31 +0000
@@ -1,10 +1,10 @@
 
-<h2><a href="index.action">$i18n.getString( "paitents_and_programs" )</a></h2>
+<h2><a href="index.action">$i18n.getString( "paitents_and_programs" )&nbsp;</a></h2>
 <ul>
-	<li><a href="patient.action">$i18n.getString( "patient_management" )</a></li>		
-	<li><a href="patientAttribute.action">$i18n.getString( "patient_attribute_management" )</a></li>
-	<li><a href="relationshipType.action">$i18n.getString( "relationship_type_management" )</a></li>
-	<li><a href="program.action">$i18n.getString( "program_management" )</a></li>
+	<li><a href="patient.action">$i18n.getString( "patient_management" )&nbsp;</a></li>		
+	<li><a href="patientAttribute.action">$i18n.getString( "patient_attribute_management" )&nbsp;</a></li>
+	<li><a href="relationshipType.action">$i18n.getString( "relationship_type_management" )&nbsp;</a></li>
+	<li><a href="program.action">$i18n.getString( "program_management" )&nbsp;</a></li>
 </ul>
 
 <br>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientMenu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientMenu.vm	2009-11-11 00:05:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientMenu.vm	2009-11-19 19:31:31 +0000
@@ -1,8 +1,8 @@
 
-<h2><a href="index.action">$i18n.getString( "paitents_and_programs" )</a></h2>
+<h2><a href="index.action">$i18n.getString( "paitents_and_programs" )&nbsp;</a></h2>
 
 <ul>
-	<li><a href="patient.action">$i18n.getString( "patient_management" )</a></li>
+	<li><a href="patient.action">$i18n.getString( "patient_management" )&nbsp;</a></li>
 </ul>
 
 <br>