diff --git a/src/main/java/org/oscarehr/casemgmt/web/CaseManagementEntry2Action.java b/src/main/java/org/oscarehr/casemgmt/web/CaseManagementEntry2Action.java
index 6dbd09f19e4..f03c90fbbbc 100644
--- a/src/main/java/org/oscarehr/casemgmt/web/CaseManagementEntry2Action.java
+++ b/src/main/java/org/oscarehr/casemgmt/web/CaseManagementEntry2Action.java
@@ -32,6 +32,7 @@
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.logging.log4j.Logger;
 import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.interceptor.SessionAware;
 import org.oscarehr.PMmodule.dao.ProgramProviderDAO;
 import org.oscarehr.PMmodule.dao.ProviderDao;
 import org.oscarehr.PMmodule.model.Program;
@@ -89,7 +90,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
-public class CaseManagementEntry2Action extends ActionSupport {
+public class CaseManagementEntry2Action extends ActionSupport implements SessionAware {
 
     HttpServletRequest request = ServletActionContext.getRequest();
     HttpServletResponse response = ServletActionContext.getResponse();
@@ -109,7 +110,11 @@ public String execute() throws Exception {
             logger.error(message);
             return null;
         }
-        String method = request.getParameter("method");
+
+        restoreFromSession();
+
+        String method = request.getParameter("method") != null ? request.getParameter("method") : (String) request.getAttribute("method");
+        
         if ("setUpMainEncounter".equals(method)) {
             return setUpMainEncounter();
         } else if ("isNoteEdited".equals(method)) {
@@ -205,7 +210,8 @@ public String edit() throws Exception {
             return null;
         }
 
-        this.setChain("");
+        CaseManagementEntryFormBean cform = new CaseManagementEntryFormBean();
+        cform.setChain("");
         request.setAttribute("change_flag", "false");
         request.setAttribute("from", "casemgmt");
 
@@ -279,7 +285,7 @@ public String edit() throws Exception {
         logger.debug("Get Issues and filter them " + String.valueOf(current - start));
         start = current;
 
-        this.setDemoNo(demono);
+        cform.setDemoNo(demono);
         CaseManagementNote note = null;
 
         String nId = request.getParameter("noteId");
@@ -411,8 +417,8 @@ else if (nId != null && !"null".equalsIgnoreCase(nId) && Integer.parseInt(nId) >
         start = current;
 
         // put the new/retrieved not in the form object for rendering on page
-        this.setCaseNote(note);
-        logger.debug("note in cform " + this.getCaseNote_note());
+        cform.setCaseNote(note);
+        logger.debug("note in cform " + cform.getCaseNote_note());
         /* set issue checked list */
 
         // get issues for current demographic, based on provider rights
@@ -458,11 +464,11 @@ else if (nId != null && !"null".equalsIgnoreCase(nId) && Integer.parseInt(nId) >
 
         current = System.currentTimeMillis();
 
-        this.setIssueCheckList(checkedList);
+        cform.setIssueCheckList(checkedList);
 
-        this.setSign("off");
-        if (!note.isIncludeissue()) this.setIncludeIssue("off");
-        else this.setIncludeIssue("on");
+        cform.setSign("off");
+        if (!note.isIncludeissue()) cform.setIncludeIssue("off");
+        else cform.setIncludeIssue("on");
 
         boolean passwd = caseManagementMgr.getEnabled();
         String chain = request.getParameter("chain");
@@ -481,15 +487,15 @@ else if (nId != null && !"null".equalsIgnoreCase(nId) && Integer.parseInt(nId) >
 
         if (casemgmtNoteLock.isLocked()) {
             note = makeNewNote(providerNo, demono, request);
-            this.setCaseNote(note);
+            cform.setCaseNote(note);
         }
 
         session.setAttribute("casemgmtNoteLock" + demono, casemgmtNoteLock);
 
         String frmName = "caseManagementEntryForm" + demono;
         //logger.debug("Setting session form - " + frmName + " - " + String.valueOf(cform != null));
-        logger.debug("note in cform " + this.getCaseNote_note());
-        //session.setAttribute(frmName, cform);
+        logger.debug("note in cform " + cform.getCaseNote_note());
+        mySessionMap.put(frmName, cform);
 
         String fwd, finalFwd = null;
         if (chain != null && chain.length() > 0) {
@@ -1213,6 +1219,7 @@ public String issueNoteSave() throws Exception {
             return null;
         }
 
+        this.setReloadUrl("/CaseManagementView.do?" + reloadUrl);
         return "listCPPNotes";
     }
 
@@ -3754,6 +3761,24 @@ public void setCPPMedicalHistory(CaseManagementCPP cpp, String providerNo, List
         }
     }
 
+    private Map<String, Object> mySessionMap;
+
+    @Override
+    public void setSession(Map<String, Object> session) {
+        this.mySessionMap = session;
+    }
+
+    private void restoreFromSession() {
+        if (demographicNo != null) {
+            String sessionName = "caseManagementEntryForm" + demographicNo;
+            CaseManagementEntryFormBean sessionFrm = (CaseManagementEntryFormBean) mySessionMap.get(sessionName);
+            if (sessionFrm != null) {
+                this.issueCheckList = sessionFrm.getIssueCheckList();
+                this.newIssueCheckList = sessionFrm.getNewIssueCheckList();
+            }
+        }
+    }
+
     private CaseManagementNote caseNote;
     private CaseManagementCPP cpp;
     private String demoNo;
@@ -3795,6 +3820,8 @@ public void setCPPMedicalHistory(CaseManagementCPP cpp, String providerNo, List
     private Integer OscarMsgType;
     private Integer OscarMsgTypeLink;
 
+    private String reloadUrl;
+
     public String getObservation_date() {
         return this.observation_date;
     }
@@ -4091,6 +4118,14 @@ public void setMinuteOfEncTransportationTime(Integer minuteOfEncTransportationTi
         this.minuteOfEncTransportationTime = minuteOfEncTransportationTime;
     }
 
+    public String getReloadUrl() {
+        return reloadUrl;
+    }
+
+    public void setReloadUrl(String reloadUrl) {
+        this.reloadUrl = reloadUrl;
+    }
+
     /**
      * @return the OscarMsgType
      *
diff --git a/src/main/java/org/oscarehr/casemgmt/web/CaseManagementView2Action.java b/src/main/java/org/oscarehr/casemgmt/web/CaseManagementView2Action.java
index abf06bb64c9..3a3f88fcbed 100644
--- a/src/main/java/org/oscarehr/casemgmt/web/CaseManagementView2Action.java
+++ b/src/main/java/org/oscarehr/casemgmt/web/CaseManagementView2Action.java
@@ -119,7 +119,8 @@ public String execute() throws Exception {
         request.getSession().setAttribute("casemgmt_msgBeans", new ArrayList<Object>());
 
 
-        String method = request.getParameter("method");
+        String method = request.getParameter("method") != null ? request.getParameter("method") : (String) request.getAttribute("method");
+
         if ("saveAndExit".equals(method)) {
             return saveAndExit();
         } else if ("save".equals(method)) {
diff --git a/src/main/webapp/WEB-INF/classes/struts.xml b/src/main/webapp/WEB-INF/classes/struts.xml
index c10d171421a..c278149f4fe 100644
--- a/src/main/webapp/WEB-INF/classes/struts.xml
+++ b/src/main/webapp/WEB-INF/classes/struts.xml
@@ -2146,7 +2146,9 @@
             <result name="setUpMainEncounterPage">/casemgmt/newEncounterLayout.jsp</result>
             <result name="view">/casemgmt/CaseManagementEntry.jsp</result>
             <result name="list">/CaseManagementView.do?method=view</result>
-            <result name="listCPPNotes">/CaseManagementView.do</result>
+            <result name="listCPPNotes" type="redirect">
+                <param name="location">${reloadUrl}</param>
+            </result>
             <result name="IssueSearch">/casemgmt/IssueSearch.jsp</result>
             <result name="NoDemoERR">/casemgmt/noDemo.jsp</result>
             <result name="windowClose">/casemgmt/close.jsp</result>
diff --git a/src/main/webapp/casemgmt/ChartNotes.jsp b/src/main/webapp/casemgmt/ChartNotes.jsp
index de6d9913725..056e4afba13 100644
--- a/src/main/webapp/casemgmt/ChartNotes.jsp
+++ b/src/main/webapp/casemgmt/ChartNotes.jsp
@@ -188,13 +188,6 @@
 </script>
 <div id="topContent">
 
-    <form name="caseManagementEntryForm" id="caseManagementEntryForm" style="display:none;">
-        <input type="hidden" name="method" value="edit">
-        <input type="hidden" name="note_edit" value="new">
-        <input type="hidden" name="noteId" value="0">
-        <input type="hidden" name="ajax" value="false">
-        <input type="hidden" name="chain" value="list">
-    </form>
     <form name="caseManagementViewForm" action="${pageContext.request.contextPath}/CaseManagementView.do" method="post">
         <input type="hidden" name="demographicNo" value="<%=demographicNo%>"/>
         <input type="hidden" name="providerNo" value="<%=provNo%>"/>
@@ -527,7 +520,7 @@
     String oscarMsgType = (String) request.getParameter("msgType");
     String OscarMsgTypeLink = (String) request.getParameter("OscarMsgTypeLink");
 %>
-<form action="<%=request.getContextPath()%>/CaseManagementEntry.do" method="post">
+<form name="caseManagementEntryForm" id="caseManagementEntryForm" action="<%=request.getContextPath()%>/CaseManagementEntry.do" method="post">
     <input type="hidden" name="demographicNo" value="<%=demographicNo%>"/>
     <input type="hidden" name="includeIssue" value="off"/>
     <input type="hidden" name="OscarMsgType" value="<%=oscarMsgType%>"/>
diff --git a/src/main/webapp/casemgmt/forward.jsp b/src/main/webapp/casemgmt/forward.jsp
index 2fa3a1af498..ac5fdcef7a3 100644
--- a/src/main/webapp/casemgmt/forward.jsp
+++ b/src/main/webapp/casemgmt/forward.jsp
@@ -44,7 +44,7 @@
 
     String redirectURL;
     if ("true".equals(useNewCaseMgmt)) {
-        redirectURL = request.getContextPath() + "/CaseManagementEntry.do?method=setUpMainEncounter&from=casemgmt&chain=list&demographicNo=" + request.getParameter("demographicNo") + "&OscarMsgTypeLink=" + request.getParameter("OscarMsgTypeLink") + "&msgType=" + request.getParameter("msgType");
+        redirectURL = request.getContextPath() + "/CaseManagementEntry.do?method=setUpMainEncounter&from=casemgmt&chain=list&demographicNo=" + request.getParameter("demographicNo") + "&providerNo=" + request.getParameter("providerNo") + "&OscarMsgTypeLink=" + request.getParameter("OscarMsgTypeLink") + "&msgType=" + request.getParameter("msgType");
     } else {
         redirectURL = request.getContextPath() + "/CaseManagementView.do";
     }
diff --git a/src/main/webapp/casemgmt/noteIssueList.jsp b/src/main/webapp/casemgmt/noteIssueList.jsp
index f14c5754fe1..3942db76e31 100644
--- a/src/main/webapp/casemgmt/noteIssueList.jsp
+++ b/src/main/webapp/casemgmt/noteIssueList.jsp
@@ -398,7 +398,7 @@
                 ${issueCheckList.issueDisplay.description}
             </a>
 
-            <c:if test="${issueCheckList.issue.used == false}">
+            <c:if test="${issueCheckList.used == false}">
                 <c:set var="submitDelete" value="removeIssue('${winame}');document.forms['caseManagementEntryForm'].deleteId.value='${status.index}';return ajaxUpdateIssues('issueDelete', $('noteIssues').up().id);" />
                 &nbsp;
                 <a href="#" onclick="${submitDelete}">Delete</a>
diff --git a/src/main/webapp/casemgmt/viewNotes.jsp b/src/main/webapp/casemgmt/viewNotes.jsp
index 3438696e4c3..8c0ba789014 100644
--- a/src/main/webapp/casemgmt/viewNotes.jsp
+++ b/src/main/webapp/casemgmt/viewNotes.jsp
@@ -23,153 +23,230 @@
     Ontario, Canada
 
 --%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
-<%@page import="org.apache.commons.lang.StringEscapeUtils" %>
-<%@page import="oscar.util.ConversionUtils" %>
-<%@page import="org.oscarehr.casemgmt.web.NoteDisplay" %>
-<% long start = System.currentTimeMillis(); %>
-<%@include file="/casemgmt/taglibs.jsp" %>
+
+<%@page import="org.apache.commons.lang.StringEscapeUtils"%>
+<%@page import="oscar.util.ConversionUtils"%>
+<%@page import="org.oscarehr.casemgmt.web.NoteDisplay"%>
+<%  long start = System.currentTimeMillis(); %>
+<%@include file="/casemgmt/taglibs.jsp"%>
 <%@page
-        import="java.util.List, java.util.Set, java.util.Iterator, org.oscarehr.casemgmt.model.CaseManagementIssue, org.oscarehr.casemgmt.model.CaseManagementNoteExt" %>
-<%@page import="org.oscarehr.common.model.Provider" %>
-<%@page import="org.oscarehr.provider.web.CppPreferencesUIBean" %>
-<%@page import="org.oscarehr.util.LoggedInInfo" %>
-<%@page import="org.oscarehr.casemgmt.web.CaseManagementViewAction" %>
-<%@page import="org.oscarehr.common.dao.UserPropertyDAO" %>
-<%@page import="org.oscarehr.common.model.UserProperty" %>
-<%@page import="org.oscarehr.common.model.PartialDate" %>
-<%@page import="org.oscarehr.util.SpringUtils" %>
-<%@page import="org.oscarehr.util.LoggedInInfo" %>
-<%@ page import="java.util.ResourceBundle"%>
+	import="java.util.List, java.util.Set, java.util.Iterator, org.oscarehr.casemgmt.model.CaseManagementIssue, org.oscarehr.casemgmt.model.CaseManagementNoteExt, org.oscarehr.casemgmt.model.CaseManagementNote"%>
+<%@page import="org.oscarehr.common.model.Provider"%>
+<%@page import="org.oscarehr.provider.web.CppPreferencesUIBean"%>
+<%@page import="org.oscarehr.util.LoggedInInfo"%>
+<%@page import="org.oscarehr.casemgmt.web.CaseManagementViewAction"%>
+<%@page import="org.oscarehr.common.dao.UserPropertyDAO"%>
+<%@page import="org.oscarehr.common.model.UserProperty"%>
+<%@page import="org.oscarehr.common.model.PartialDate"%>
+<%@page import="org.oscarehr.util.SpringUtils"%>
+<%@page import="org.oscarehr.util.LoggedInInfo"%>
+
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+
 <%
-    String roleName$ = (String) session.getAttribute("userrole") + "," + (String) session.getAttribute("user");
-    boolean authed = true;
+    String roleName$ = (String)session.getAttribute("userrole") + "," + (String) session.getAttribute("user");
+    boolean authed=true;
 %>
 <security:oscarSec roleName="<%=roleName$%>" objectName="_casemgmt.notes" rights="r" reverse="<%=true%>">
-    <%authed = false; %>
-    <%response.sendRedirect(request.getContextPath() + "/securityError.jsp?type=_casemgmt.notes");%>
+	<%authed=false; %>
+	<%response.sendRedirect(request.getContextPath() + "/securityError.jsp?type=_casemgmt.notes");%>
 </security:oscarSec>
 <%
-    if (!authed) {
-        return;
-    }
-    ResourceBundle bundle = ResourceBundle.getBundle("oscarResources", request.getLocale());
-    String titleParam = request.getParameter("title");
-    String titleMsg = bundle.getString(titleParam);
+	if(!authed) {
+		return;
+	}
 %>
 
-<c:set var="ctx" value="${pageContext.request.contextPath}" scope="request"/>
+<c:set var="ctx" value="${pageContext.request.contextPath}"
+	scope="request" />
 <c:set var="num" value="${fn:length(Notes)}" />
 <div class="nav-menu-heading" style="background-color:#<c:out value="${param.hc}"/>">
-    <div class="nav-menu-add-button">
-        <h3>
-            <%
-                LoggedInInfo loggedInInfo = LoggedInInfo.getLoggedInInfoFromSession(request);
-                com.quatro.service.security.SecurityManager securityManager = new com.quatro.service.security.SecurityManager();
-                if (securityManager.hasWriteAccess("_" + request.getParameter("issue_code"), roleName$)) {
-            %>
-            <a href="javascript:void(0)" title='Add Item' onclick="return showEdit(event,'<%=titleMsg%>','',0,'','','','<%=request.getAttribute("addUrl")%>0', 
-                '<c:out value="${param.cmd}"/>','<%=request.getAttribute("identUrl")%>','<%=request.getAttribute("cppIssue")%>','','<c:out value="${param.demographicNo}"/>');">+</a>
-            <% } else { %>
-            &nbsp;
-            <% } %>
-        </h3>
-    </div>
-    <div class="nav-menu-title">
-        <h3>
-            <a href="javascript:void(0)" onclick="return showIssueHistory('<c:out
-                    value="${param.demographicNo}"/>','<%=request.getAttribute("issueIds")%>');"><%=titleMsg%></a>
-        </h3>
-    </div>
+<div class="nav-menu-add-button">
+<h3>
+<%
+	LoggedInInfo loggedInInfo=LoggedInInfo.getLoggedInInfoFromSession(request);
+	com.quatro.service.security.SecurityManager securityManager = new com.quatro.service.security.SecurityManager();
+	if(securityManager.hasWriteAccess("_" + request.getParameter("issue_code"),roleName$)) {
+%>
+<a href="javascript:void(0)" title='Add Item' onclick="return showEdit(event,'<fmt:setBundle basename="oscarResources"/><fmt:message key="${param.title}" />','',0,'','','','<%=request.getAttribute("addUrl")%>0', '<c:out value="${param.cmd}"/>','<%=request.getAttribute("identUrl")%>','<%=request.getAttribute("cppIssue")%>','','<c:out value="${param.demographicNo}"/>');">+</a>
+<% } else { %>
+	&nbsp;
+<% } %>
+</h3>
+</div>
+<div class="nav-menu-title">
+<h3>
+	<a href="javascript:void(0)" onclick="return showIssueHistory('<c:out value="${param.demographicNo}"/>','<%=request.getAttribute("issueIds")%>');"><fmt:setBundle basename="oscarResources"/><fmt:message key="${param.title}" /></a>
+</h3>
+</div>
 </div>
-<c:choose>
-    <c:when test='${param.title == "oscarEncounter.oMeds.title" || param.title == "oscarEncounter.riskFactors.title" || param.title == "oscarEncounter.famHistory.title"|| param.noheight == "true"}'>
-        <div style='clear:both;' class='topBox-notes'>
-    </c:when>
-    <c:otherwise>
-        <div style='clear:both;' class='topBox-notes'>
-    </c:otherwise>
-</c:choose>
+        <c:choose>
+            <c:when test='${param.title == "oscarEncounter.oMeds.title" || param.title == "oscarEncounter.riskFactors.title" || param.title == "oscarEncounter.famHistory.title"|| param.noheight == "true"}'>
+                <div style='clear:both;' class='topBox-notes'>
+            </c:when>
+            <c:otherwise>
+                <div style='clear:both;' class='topBox-notes'>
+            </c:otherwise>
+        </c:choose>
 
 <ul>
-    <c:forEach var="note" items="${Notes}" varStatus="status">
-        <c:set var="noteId" value="${note.id}" />
-        <c:set var="backgroundColor" value="${status.index % 2 == 0 ? '#F3F3F3' : '#FFFFFF'}" />
-        
-        <li class="cpp" style="background-color: ${backgroundColor};">
-            <span id="spanListNote${noteId}">
-                <c:choose>
-                    <c:when test="${param.title == 'oscarEncounter.oMeds.title' || param.title == 'oscarEncounter.riskFactors.title' || param.title == 'oscarEncounter.famHistory.title' || param.noheight == 'true'}">
-                        <a class="links" onmouseover="this.className='linkhover'" onmouseout="this.className='links'"
-                           title="Rev:${note.revision} - Last update:${note.update_date}"
-                           id="listNote${noteId}" href="javascript:void(0)"
-                           onclick="showEdit(event,'${titleMsg}','${noteId}','${editors}','${note.observation_date}','${note.revision}','${note.note}','${addUrl}${noteId}','${param.cmd}','${identUrl}','${noteIssues}','${noteExts}','${param.demographicNo}');return false;">
-                            ${htmlNoteTxt}
-                        </a>
-                    </c:when>
-                    <c:otherwise>
-                        <a class="topLinks" onmouseover="this.className='topLinkhover'" onmouseout="this.className='topLinks'"
-                           title="Rev:${note.revision} - Last update:${note.update_date}"
-                           id="listNote${noteId}" href="javascript:void(0)"
-                           onclick="showEdit(event,'${titleMsg}','${noteId}','${editors}','${note.observation_date}','${note.revision}','${note.note}','${addUrl}${noteId}','${param.cmd}','${identUrl}','${noteIssues}','${noteExts}','${param.demographicNo}');return false;">
-                            ${htmlNoteTxt}
-                        </a>
-                    </c:otherwise>
-                </c:choose>
-            </span>
-        </li>
-    </c:forEach>
-
-    <!-- Handling remoteNotes -->
-    <c:if test="${not empty remoteNotes}">
-        <c:forEach var="remoteNote" items="${remoteNotes}" varStatus="status">
-            <c:set var="remoteBackgroundColor" value="${status.index % 2 == 0 ? '#FFCCCC' : '#CCA3A3'}" />
-            <li class="cpp" style="background-color: ${remoteBackgroundColor};">
-                <a class="links" onmouseover="this.className='linkhover'" onmouseout="this.className='links'"
-                   title="${remoteNote.location} by ${remoteNote.providerName} on ${remoteNote.observationDate}"
+<%
+    List<CaseManagementNoteExt> noteExts = (List<CaseManagementNoteExt>)request.getAttribute("NoteExts");
+    List<CaseManagementNote> notes = (List<CaseManagementNote>) request.getAttribute("Notes");
+    if (notes != null) {
+        for (int i = 0; i < notes.size(); i++) {
+            CaseManagementNote note = notes.get(i);
+%>
+    <input type="hidden" id="<%= request.getParameter("cmd") + note.getId() %>" value="<%= i %>" />
+
+    <% if (i % 2 == 0) { %>
+        <li class="cpp" style="background-color: #F3F3F3;">
+    <% } else { %>
+        <li class="cpp">
+    <% } %>
+
+<%
+            CppPreferencesUIBean prefsBean = new CppPreferencesUIBean(loggedInInfo.getLoggedInProviderNo());
+            prefsBean.loadValues();
+
+            String addlData = CaseManagementViewAction.getCppAdditionalData(note.getId(), (String) request.getAttribute("cppIssue"), noteExts, prefsBean);
+            String strNoteExts = getNoteExts(note.getId(), noteExts);
+
+            List<Provider> listEditors = note.getEditors();
+            StringBuffer editors = new StringBuffer();
+            for (Provider p : listEditors) {
+                editors.append(p.getFormattedName()).append(";");
+            }
+
+            String htmlNoteTxt = note.getNote() + addlData;
+
+            boolean singleLine = Boolean.valueOf(oscar.OscarProperties.getInstance().getProperty("echart.cpp.single_line", "false"));
+            UserPropertyDAO userPropertyDao = (UserPropertyDAO) SpringUtils.getBean(UserPropertyDAO.class);
+            UserProperty prop = userPropertyDao.getProp(loggedInInfo.getLoggedInProviderNo(), UserProperty.CPP_SINGLE_LINE);
+            if (prop != null) {
+                singleLine = "yes".equals(prop.getValue());
+            }
+            if (singleLine) {
+                if (htmlNoteTxt.indexOf("\n") != -1) {
+                    htmlNoteTxt = htmlNoteTxt.substring(0, htmlNoteTxt.indexOf("\n")) + "...";
+                }
+            } else {
+                htmlNoteTxt = htmlNoteTxt.replaceAll("\n", "<br>");
+            }
+
+            String noteTxt = note.getNote().replaceAll("\"", "");
+            noteTxt = org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(noteTxt);
+
+            Set<CaseManagementIssue> setIssues = note.getIssues();
+            StringBuffer strNoteIssues = new StringBuffer();
+            Iterator<CaseManagementIssue> iter = setIssues.iterator();
+            while (iter.hasNext()) {
+                CaseManagementIssue iss = iter.next();
+                strNoteIssues.append(iss.getIssue_id()).append(";")
+                             .append(iss.getIssue().getCode()).append(";")
+                             .append(org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(iss.getIssue().getDescription()));
+                if (iter.hasNext()) {
+                    strNoteIssues.append(";");
+                }
+            }
+%>
+    <span id="spanListNote<%= note.getId() %>">
+        <c:choose>
+            <c:when test='${param.title == "oscarEncounter.oMeds.title" || param.title == "oscarEncounter.riskFactors.title" || param.title == "oscarEncounter.famHistory.title" || param.noheight == "true"}'>
+                <a class="links"
+                   onmouseover="this.className='linkhover'"
+                   onmouseout="this.className='links'"
+                   title="Rev:<%= note.getRevision() %> - Last update:<%= note.getUpdate_date() %>"
+                   id="listNote<%= note.getId() %>"
+                   href="javascript:void(0)"
+                   onclick="showEdit(event,'<fmt:setBundle basename="oscarResources"/><fmt:message key="${param.title}" />','<%= note.getId() %>','<%= StringEscapeUtils.escapeJavaScript(editors.toString()) %>','<%= note.getObservation_date() %>','<%= note.getRevision() %>','<%= noteTxt %>', '<%= request.getAttribute("addUrl") %><%= note.getId() %>', '<%= request.getParameter("cmd") %>','<%= request.getAttribute("identUrl") %>','<%= strNoteIssues.toString() %>','<%= strNoteExts %>','<%= request.getParameter("demographicNo") %>');return false;">
+            </c:when>
+            <c:otherwise>
+                <a class="topLinks"
+                   onmouseover="this.className='topLinkhover'"
+                   onmouseout="this.className='topLinks'"
+                   title="Rev:<%= note.getRevision() %> - Last update:<%= note.getUpdate_date() %>"
+                   id="listNote<%= note.getId() %>"
                    href="javascript:void(0)"
-                   onclick="showIntegratedNote('${titleMsg}', '${remoteNote.note}', '${remoteNote.location}', '${remoteNote.providerName}', '${remoteNote.observationDate}');">
-                    ${remoteNote.note}
-                </a>
-            </li>
-        </c:forEach>
-    </c:if>
+                   onclick="showEdit(event,'<fmt:setBundle basename="oscarResources"/><fmt:message key="${param.title}" />','<%= note.getId() %>','<%= StringEscapeUtils.escapeJavaScript(editors.toString()) %>','<%= note.getObservation_date() %>','<%= note.getRevision() %>','<%= noteTxt %>', '<%= request.getAttribute("addUrl") %><%= note.getId() %>', '<%= request.getParameter("cmd") %>','<%= request.getAttribute("identUrl") %>','<%= strNoteIssues.toString() %>','<%= strNoteExts %>','<%= request.getParameter("demographicNo") %>');return false;">
+            </c:otherwise>
+        </c:choose>
+
+        <%= htmlNoteTxt %></a>
+    </span></li>
+<%
+        } // end for
+    } // end if
+%>
+
+
+	<%
+		List<NoteDisplay>remoteNotes = (List<NoteDisplay>)request.getAttribute("remoteNotes");
+		String htmlText;
+		int noteIdx = 0;
+		if( remoteNotes != null ) {
+		    for( NoteDisplay remoteNote : remoteNotes) {
+				htmlText = remoteNote.getNote();
+				htmlText = htmlText.replaceAll("\n", "<br>");
+				if( noteIdx % 2 == 0 ) {
+				%>				
+				<li class="cpp" style="background-color: #FFCCCC;">
+				<%
+				}
+				else {
+				    %>
+				    <li class="cpp" style="background-color: #CCA3A3">
+				    <%
+				}
+				%>
+					<a class="links" onmouseover="this.className='linkhover'"	onmouseout="this.className='links'" title="<%=remoteNote.getLocation()%> by <%=remoteNote.getProviderName()%> on <%=ConversionUtils.toTimestampString(remoteNote.getObservationDate())%>" href="javascript:void(0)" onclick="showIntegratedNote('<fmt:setBundle basename="oscarResources"/><fmt:message key="${param.title}" />',<%=htmlText%>,<%=remoteNote.getLocation()%>, <%=remoteNote.getProviderName()%>, <%=ConversionUtils.toTimestampString(remoteNote.getObservationDate())%>);">					
+					<%=htmlText%>
+					</a>
+				</li>
+				<%
+		    }
+		    
+		}
+	%>
 </ul>
 
-<input type="hidden" id="<c:out value="${param.cmd}"/>num" value="${num}">
-<input type="hidden" id="<c:out value="${param.cmd}"/>threshold" value="0">
+<input type="hidden" id="${param.cmd}num" value="${num}">
+<input type="hidden" id="${param.cmd}threshold" value="0">
+
 <%!
     String getNoteExts(Long noteId, List<CaseManagementNoteExt> lcme) {
-        StringBuffer strcme = new StringBuffer();
-        for (CaseManagementNoteExt cme : lcme) {
-            if (cme.getNoteId().equals(noteId)) {
-                String key = cme.getKeyVal();
-                String val = null;
-                if (key.contains(" Date")) {
-                    val = readPartialDate(cme);
-                } else {
-                    val = org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(cme.getValue());
-                }
-                if (strcme.length() > 0) strcme.append(";");
-                strcme.append(key + ";" + val);
-            }
-        }
-        return strcme.toString();
+	StringBuffer strcme = new StringBuffer();
+	for (CaseManagementNoteExt cme : lcme) {
+	    if (cme.getNoteId().equals(noteId)) {
+		String key = cme.getKeyVal();
+		String val = null;
+		if (key.contains(" Date")) {
+		    val = readPartialDate(cme);
+		} else {
+		    val = org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(cme.getValue());
+		}
+		if (strcme.length()>0) strcme.append(";");
+		strcme.append(key + ";" + val);
+	    }
+	}
+	return strcme.toString();
     }
 
-    String readPartialDate(CaseManagementNoteExt cme) {
-        String type = cme.getValue();
-        String val = null;
-
-        if (type != null && !type.trim().equals("")) {
-            if (type.equals(PartialDate.YEARONLY))
-                val = oscar.util.UtilDateUtilities.DateToString(cme.getDateValue(), "yyyy");
-            else if (type.equals(PartialDate.YEARMONTH))
-                val = oscar.util.UtilDateUtilities.DateToString(cme.getDateValue(), "yyyy-MM");
-            else val = oscar.util.UtilDateUtilities.DateToString(cme.getDateValue(), "yyyy-MM-dd");
-        } else {
-            val = oscar.util.UtilDateUtilities.DateToString(cme.getDateValue(), "yyyy-MM-dd");
+        String readPartialDate(CaseManagementNoteExt cme) {
+            String type = cme.getValue();
+            String val = null;
+
+            if (type!=null && !type.trim().equals("")) {
+                if (type.equals(PartialDate.YEARONLY))
+                    val = oscar.util.UtilDateUtilities.DateToString(cme.getDateValue(),"yyyy");
+                else if (type.equals(PartialDate.YEARMONTH))
+                    val = oscar.util.UtilDateUtilities.DateToString(cme.getDateValue(),"yyyy-MM");
+                else val = oscar.util.UtilDateUtilities.DateToString(cme.getDateValue(),"yyyy-MM-dd");
+            } else {
+                val = oscar.util.UtilDateUtilities.DateToString(cme.getDateValue(),"yyyy-MM-dd");
+            }
+            return val;
         }
-        return val;
-    }
 %>