anchor.diff:  </c:forEach>
   <div>&nbsp;</div>
   </c:if>
  -<tags:createField property="instrId" component="${component}"/>
   <c:if test="${componentView == 'edit'}">
  -<tags:actionURLButton buttonText="Add Instrument"  actionId="lava.crms.assessment.instrument.instrument" eventId="instrument__add" component="${component}" locked="${currentPatient.locked}"/>
  +	<c:set var="instrId">
  +		<tags:componentProperty component="${component}" property="instrId"/>
  +	</c:set>
  +	<c:if test="${not empty instrId}">
  +		<c:set var="instrTypeEncoded">
  +			<tags:componentProperty component="${component}" property="instrument" property2="instrTypeEncoded"/>
  +		</c:set>
  +		<c:set var="instrLink">
  +			<tags:eventActionButton buttonImage="view" component="${instrTypeEncoded}" action="view" pageName="${component}" parameters="id,${instrId}" javascript="submitted=true;"/>
  +		</c:set>
  +	</c:if>
  +</c:if>	
  +<tags:createField property="instrId" component="${component}" link="${instrLink}"/>
  +<c:if test="${componentView == 'edit'}">
  +<tags:eventButton buttonText="Add Instrument" component="instrument" action="add"  pageName="${component}" javascript="submitted=true;"/>
   </c:if>
   </page:applyDecorator>
   
  +<tags:contentColumn columnClass="colLeft2Col5050">
   <page:applyDecorator name="component.entity.section">
  -  <page:param name="sectionId">currStatus</page:param>
  -  <page:param name="sectionNameKey">${component}.currStatus.section</page:param>
  -<tags:createField property="currStatus" component="${component}" entityType="protocol"/>
  -<tags:createField property="currReason" component="${component}" entityType="protocol"/>
  -<tags:createField property="currNote" component="${component}" entityType="protocol"/>
  +  <page:param name="sectionId">compStatusSection</page:param>
  +  <page:param name="sectionNameKey">${component}.compStatusSection.section</page:param>
  +<tags:createField property="compStatusOverride" component="${component}"/>
  +<tags:createField property="compStatus" component="${component}"/>
  +<tags:createField property="compStatusComputed" component="${component}"/>
  +<tags:createField property="compReason" component="${component}"/>
  +<tags:createField property="compNote" component="${component}"/>
   </page:applyDecorator>
  +</tags:contentColumn>
   
  -<page:applyDecorator name="component.entity.section">
  -  <page:param name="sectionId">collectWin</page:param>
  -  <page:param name="sectionNameKey">${component}.collectWin.section</page:param>
  -<tags:createField property="collectAnchorDate" component="${component}"/>
  -<tags:createField property="collectWinStart" component="${component}"/>
  -<tags:createField property="collectWinEnd" component="${component}"/>
  -</page:applyDecorator>
  -
  +<tags:contentColumn columnClass="colRight2Col5050">
   <page:applyDecorator name="component.entity.section">
     <page:param name="sectionId">collectStatus</page:param>
     <page:param name="sectionNameKey">${component}.collectStatus.section</page:param>
  
positive.code: <page:applyDecorator name="component.content">
    <page:param name="component">${component}</page:param>
    <page:param name="focusField"></page:param>  
    <page:param name="pageHeadingArgs">${protocolConfigLabel},${instrumentConfigLabel},<tags:componentProperty component="${component}" property="patient" property2="fullNameNoSuffix"/></page:param>
    <page:param name="quicklinks">assignInstr,currStatus,collectWin,collectStatus</page:param>
  
  <page:applyDecorator name="component.entity.content">
    <page:param name="component">${component}</page:param>
  
negative.code: <c:if test="${componentView != 'add'}">
  <tags:createField property="id" component="${component}"/>
  </c:if>
  <tags:createField property="protocolInstrumentConfig.label" component="${component}" metadataName="protocolInstrumentConfig.label"/>
  </page:applyDecorator>
  
  <page:applyDecorator name="component.entity.section">
  