Segments summary updates

resources/views/app/patient/segment-templates/intake_interventions/summary.blade.php

@@ -19,33 +19,43 @@ foreach($interventions as $intervention) {
     <div class="text-secondary">No interventions</div>
 <?php else: ?>
     <?php foreach($grouped as $k => $group): ?>
+        <div class="">
         <b><?= $k ?></b>
-        <?php foreach($group as $intervention): ?>
-            <div class="mb-2 pl-3">
-                <div class="d-flex align-items-baseline">
-                    <div class="<?= $intervention->is_removed ? 'strike-through' : '' ?>">
-                        <?= !!@($intervention->data->intervention) ? @($intervention->data->intervention) : '' ?>
-                        <br>
-                        <span class="text-secondary"><?= !!@($intervention->data->description) ? @($intervention->data->description) : '' ?></span>
-                    </div>
-                    <?php if ($intervention->is_removed): ?>
-                        @if($intervention->removal_reason_category === 'DURING_VISIT')
-                            <span class="ml-2 text-sm text-secondary">Removed during visit</span>
-                        @elseif($intervention->removal_reason_category === 'ON_INTAKE')
-                            <span class="ml-2 text-sm text-secondary">Removed on intake</span>
-                        @endif
-                    <?php elseif ($intervention->added_in_note_id === $note->id): ?>
-                    <span class="ml-2 text-sm text-success">* Added on intake</span>
-                    <?php endif; ?>
-                </div>
-                <?php $review = $intervention->childReviewAddedInNote($note); ?>
-                <?php if(!!$review): ?>
-                <div class="pl-3 mt-1">
-                    <div class="text-secondary font-weight-bold">Subjective</div>
-                    <div>{!! $review->data->value !!}</div>
-                </div>
-                <?php endif; ?>
-            </div>
-        <?php endforeach; ?>
+        <table class="table table-bordered table-xs table-cage mb-0">
+            <?php foreach($group as $intervention): ?>
+                <tr>
+                    <td class="px-2" style="max-width: 300px;">
+                        <div class="font-weight-bold <?= $intervention->is_removed ? 'strike-through' : '' ?>">
+                            <?= !!@($intervention->data->intervention) ? @($intervention->data->intervention) : '-' ?>
+                            <br>
+                            <span class="text-secondary"><?= !!@($intervention->data->description) ? @($intervention->data->description) : '' ?></span>
+                        </div>
+                    </td>
+                    <td class="px-2" style="max-width: 300px;">
+                        <div>
+                            <?php $review = $intervention->childReviewAddedInNote($note); ?>
+                            <?php if(!!$review): ?>
+                            <div class="pl-3 mt-1">
+                                <div class="text-secondary font-weight-bold">Subjective</div>
+                                <div>{!! $review->data->value !!}</div>
+                            </div>
+                            <?php endif; ?>
+                        </div>
+                        <div class="d-flex align-items-baseline">                        
+                            <?php if ($intervention->is_removed): ?>
+                                @if($intervention->removal_reason_category === 'DURING_VISIT')
+                                    <span class="ml-2 text-sm text-secondary">Removed during visit</span>
+                                @elseif($intervention->removal_reason_category === 'ON_INTAKE')
+                                    <span class="ml-2 text-sm text-secondary">Removed on intake</span>
+                                @endif
+                            <?php elseif ($intervention->added_in_note_id === $note->id): ?>
+                            <span class="ml-2 text-sm text-success">* Added on intake</span>
+                            <?php endif; ?>
+                        </div>
+                    </td>
+                </tr>
+            <?php endforeach; ?>
+        </table>
+        </div>
     <?php endforeach; ?>
 <?php endif; ?>

resources/views/app/patient/segment-templates/plan_allergies/summary.blade.php

@@ -22,57 +22,61 @@ $plural = 'Allergies';
 <?php if (!count($points)): ?>
     <div class="text-secondary">-</div>
 <?php else: ?>
-    <?php foreach ($points as $point): ?>
+    <table class="table table-bordered table-xs table-cage mb-0">
+    <?php $j = 0; foreach ($points as $point): $j++; ?>
         <?php if($point->is_removed && $point->is_removed_due_to_entry_error) continue; ?>
         <?php $rel = $point->relevanceToNote($note); ?>
         <?php $plan = $point->lastChildPlan; ?>
         <?php if($plan && @($plan->data)) $plan->data = json_decode($plan->data); ?>
         <?php $numVisible++; ?>
-        <div class="mb-2">
-            <div class="d-flex align-items-baseline">
+        <tr>
+            <td class="fit px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
                 @if($rel)
-                    <span class="text-info mr-1">
-                        <i class="fa fa-star"></i>
-                    </span>
                     <?php $numRelevant++; ?>
+                    {{ $j }}.*
+                @else
+                    {{ $j }}.
                 @endif
+            </td>
+            <td class="px-2" style="max-width: 300px;">
                 <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
                     <b><?= !!@($point->data->name) ? @($point->data->name) : '-' ?></b>
                 </div>
-                <?php if ($point->is_removed): ?>
-                    @if($point->removal_reason_category === 'DURING_VISIT')
-                        <span class="ml-2 text-sm text-secondary">Removed during visit</span>
-                    @elseif($point->removal_reason_category === 'ON_INTAKE')
-                        <span class="ml-2 text-sm text-secondary">Removed on intake</span>
-                    @endif
-                <?php elseif ($point->added_in_note_id === $note->id): ?>
-                    <?php if ($point->addition_reason_category === 'DURING_VISIT'): ?>
-                        <span class="ml-2 text-sm text-success">* Diagnosed during visit</span>
-                    <?php else: ?>
-                        <span class="ml-2 text-sm text-info">* Added on intake</span>
-                    <?php endif;?>
-                <?php endif; ?>
-            </div>
-            <?php if(!!$plan): ?>
-            <div class="pl-3 mt-1 d-flex align-items-baseline">
-                <span class="text-secondary font-weight-bold mr-2">Plan:</span>
-                <span>{!! $plan->data->value !!}</span>
-            </div>
-            <?php elseif($rel): ?>
-            <div class="relevant-without-plan text-warning-mellow text-sm mt-1" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Plan missing</div>
-            <?php endif; ?>
-        </div>
+            </td>
+            <td class="px-2" style="max-width: 300px;">
+                <div>
+                    <?php if(!!$plan): ?>
+                        <div class="pl-3 mt-1 d-flex align-items-baseline">
+                            <span class="text-secondary font-weight-bold mr-2">Plan:</span>
+                            <span>{!! $plan->data->value !!}</span>
+                        </div>
+                    <?php elseif($rel): ?>
+                        <div class="relevant-without-plan text-warning-mellow text-sm mt-1" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Plan missing</div>
+                    <?php endif; ?>
+                </div>
+                <div class="d-flex align-items-baseline">
+                    <?php if ($point->is_removed): ?>
+                        @if($point->removal_reason_category === 'DURING_VISIT')
+                            <span class="ml-2 text-sm text-secondary">Removed during visit</span>
+                        @elseif($point->removal_reason_category === 'ON_INTAKE')
+                            <span class="ml-2 text-sm text-secondary">Removed on intake</span>
+                        @endif
+                    <?php elseif ($point->added_in_note_id === $note->id): ?>
+                        <?php if ($point->addition_reason_category === 'DURING_VISIT'): ?>
+                            <span class="ml-2 text-sm text-success">* Diagnosed during visit</span>
+                        <?php else: ?>
+                            <span class="ml-2 text-sm text-info">* Added on intake</span>
+                        <?php endif;?>
+                    <?php endif; ?>
+                </div>
+            </td>
+        </tr>
     <?php endforeach; ?>
+    </table>
     @if(!$numVisible)
         <div class="d-flex align-items-baseline mr-1">
             <span class="text-secondary">-</span>
         </div>
     @endif
-    @if($numRelevant)
-        <div class="d-flex align-items-baseline text-info mr-1 mt-3">
-            <span class="text-sm mr-1"><i class="fa fa-star text-sm"></i></span>
-            <span class="text-sm">{{$plural}} relevant to this note</span>
-        </div>
-    @endif
 <?php endif; ?>
 <?php endif; ?>

resources/views/app/patient/segment-templates/plan_care_team/summary.blade.php

@@ -13,20 +13,23 @@ $plural = 'Care team members';
 <?php if (!count($points)): ?>
     <div class="text-secondary">-</div>
 <?php else: ?>
-    <?php foreach ($points as $point): ?>
+    <table class="table table-bordered table-xs table-cage mb-0">
+    <?php $j = 0; foreach ($points as $point): $j++; ?>
         <?php if($point->is_removed && $point->is_removed_due_to_entry_error) continue; ?>
         <?php $rel = $point->relevanceToNote($note); ?>
         <?php $plan = $point->lastChildPlan; ?>
         <?php if($plan && @($plan->data)) $plan->data = json_decode($plan->data); ?>
         <?php $numVisible++; ?>
-        <div class="mb-2">
-            <div class="d-flex align-items-baseline">
+        <tr>
+            <td class="fit px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
                 @if($rel)
-                    <span class="text-info mr-1">
-                        <i class="fa fa-star"></i>
-                    </span>
                     <?php $numRelevant++; ?>
+                    {{ $j }}.*
+                @else
+                    {{ $j }}.
                 @endif
+            </td>
+            <td class="px-2" style="max-width: 300px;">
                 <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
                     <b><?= !!@($point->data->name) ? @($point->data->name) : '-' ?></b>
                     <?= !!@($point->data->specialty) ? '/&nbsp;' . @($point->data->specialty) . '' : '' ?>
@@ -35,39 +38,39 @@ $plural = 'Care team members';
                     <?= !!@($point->data->fax) ? '&nbsp;/&nbsp;Fax: ' . @($point->data->fax) . '<br>' : '' ?>
                     <?= !!@($point->data->date) ? '&nbsp;/&nbsp;Date: ' . @($point->data->date) : '' ?>
                 </div>
-                <?php if ($point->is_removed): ?>
-                    @if($point->removal_reason_category === 'DURING_VISIT')
-                        <span class="ml-2 text-sm text-secondary">Removed during visit</span>
-                    @elseif($point->removal_reason_category === 'ON_INTAKE')
-                        <span class="ml-2 text-sm text-secondary">Removed on intake</span>
-                    @endif
-                <?php elseif ($point->added_in_note_id === $note->id): ?>
-                    <?php if ($point->addition_reason_category === 'DURING_VISIT'): ?>
-                        <span class="ml-2 text-sm text-success">* Added during visit</span>
-                    <?php else: ?>
-                        <span class="ml-2 text-sm text-info">* Added on intake</span>
-                    <?php endif;?>
-                <?php endif; ?>
-            </div>
-            <?php if(!!$plan): ?>
-            <div class="pl-3 mt-1 d-flex align-items-baseline">
-                <span class="text-secondary font-weight-bold mr-2">Plan:</span>
-                <span>{!! $plan->data->value !!}</span>
-            </div>
-            <?php elseif($rel): ?>
-            <div class="relevant-without-plan text-warning-mellow text-sm mt-1" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Plan missing</div>
-            <?php endif; ?>
-        </div>
+            </td>
+            <td class="px-2" style="max-width:300px;">
+                <div>
+                    <?php if(!!$plan): ?>
+                        <div class="pl-3 mt-1 d-flex align-items-baseline">
+                            <span>{!! $plan->data->value !!}</span>
+                        </div>
+                    <?php elseif($rel): ?>
+                        <div class="relevant-without-plan text-warning-mellow text-sm mt-1" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Plan missing</div>
+                    <?php endif; ?>
+                </div>
+                <div class="d-flex align-items-baseline">
+                    <?php if ($point->is_removed): ?>
+                        @if($point->removal_reason_category === 'DURING_VISIT')
+                            <span class="ml-2 text-sm text-secondary">Removed during visit</span>
+                        @elseif($point->removal_reason_category === 'ON_INTAKE')
+                            <span class="ml-2 text-sm text-secondary">Removed on intake</span>
+                        @endif
+                    <?php elseif ($point->added_in_note_id === $note->id): ?>
+                        <?php if ($point->addition_reason_category === 'DURING_VISIT'): ?>
+                            <span class="ml-2 text-sm text-success">* Added during visit</span>
+                        <?php else: ?>
+                            <span class="ml-2 text-sm text-info">* Added on intake</span>
+                        <?php endif;?>
+                    <?php endif; ?>
+                </div>
+            </td>
+        </tr>
     <?php endforeach; ?>
+    </table>
     @if(!$numVisible)
         <div class="d-flex align-items-baseline mr-1">
             <span class="text-secondary">-</span>
         </div>
     @endif
-    @if($numRelevant)
-        <div class="d-flex align-items-baseline text-info mr-1 mt-3">
-            <span class="text-sm mr-1"><i class="fa fa-star text-sm"></i></span>
-            <span class="text-sm">{{$plural}} relevant to this note</span>
-        </div>
-    @endif
 <?php endif; ?>

resources/views/app/patient/segment-templates/plan_goals/summary.blade.php

@@ -13,56 +13,59 @@ $plural = 'Goals';
 <?php if (!count($points)): ?>
     <div class="text-secondary">-</div>
 <?php else: ?>
-    <?php foreach ($points as $point): ?>
+    <table class="table table-bordered table-xs table-cage mb-0">
+    <?php $j = 0; foreach ($points as $point): $j++; ?>
         <?php if($point->is_removed && $point->is_removed_due_to_entry_error) continue; ?>
         <?php $rel = $point->relevanceToNote($note); ?>
         <?php $plan = $point->lastChildPlan; ?>
         <?php if($plan && @($plan->data)) $plan->data = json_decode($plan->data); ?>
         <?php $numVisible++; ?>
-        <div class="mb-2">
-            <div class="d-flex align-items-baseline">
+        <tr>
+            <td class="fit px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
                 @if($rel)
-                    <span class="text-info mr-1">
-                        <i class="fa fa-star"></i>
-                    </span>
                     <?php $numRelevant++; ?>
+                    {{ $j }}.*
+                @else
+                    {{ $j }}.
                 @endif
+            </td>
+            <td class="px-2" style="max-width: 300px;">
                 <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
                     <b><?= !!@($point->data->goal) ? @($point->data->goal) : '-' ?></b>
                 </div>
-                <?php if ($point->is_removed): ?>
-                    @if($point->removal_reason_category === 'DURING_VISIT')
-                        <span class="ml-2 text-sm text-secondary">Removed during visit</span>
-                    @elseif($point->removal_reason_category === 'ON_INTAKE')
-                        <span class="ml-2 text-sm text-secondary">Removed on intake</span>
-                    @endif
-                <?php elseif ($point->added_in_note_id === $note->id): ?>
-                    <?php if ($point->addition_reason_category === 'DURING_VISIT'): ?>
-                        <span class="ml-2 text-sm text-success">* Prescribed during visit</span>
-                    <?php else: ?>
-                        <span class="ml-2 text-sm text-info">* Added on intake</span>
-                    <?php endif;?>
-                <?php endif; ?>
-            </div>
-            <?php if(!!$plan): ?>
-            <div class="pl-3 mt-1 d-flex align-items-baseline">
-                <span class="text-secondary font-weight-bold mr-2">Plan:</span>
-                <span>{!! $plan->data->value !!}</span>
-            </div>
-            <?php elseif($rel): ?>
-            <div class="relevant-without-plan text-warning-mellow text-sm mt-1" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Plan missing</div>
-            <?php endif; ?>
-        </div>
+            </td>
+            <td class="px-2" style="max-width:300px;">
+                <div>
+                    <?php if(!!$plan): ?>
+                        <div class="pl-3 mt-1 d-flex align-items-baseline">
+                            <span>{!! $plan->data->value !!}</span>
+                        </div>
+                    <?php elseif($rel): ?>
+                        <div class="relevant-without-plan text-warning-mellow text-sm mt-1" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Plan missing</div>
+                    <?php endif; ?>
+                </div>
+                <div class="d-flex align-items-baseline">
+                    <?php if ($point->is_removed): ?>
+                        @if($point->removal_reason_category === 'DURING_VISIT')
+                            <span class="ml-2 text-sm text-secondary">Removed during visit</span>
+                        @elseif($point->removal_reason_category === 'ON_INTAKE')
+                            <span class="ml-2 text-sm text-secondary">Removed on intake</span>
+                        @endif
+                    <?php elseif ($point->added_in_note_id === $note->id): ?>
+                        <?php if ($point->addition_reason_category === 'DURING_VISIT'): ?>
+                            <span class="ml-2 text-sm text-success">* Prescribed during visit</span>
+                        <?php else: ?>
+                            <span class="ml-2 text-sm text-info">* Added on intake</span>
+                        <?php endif;?>
+                    <?php endif; ?>
+                </div>
+            </td>
+        </tr>
     <?php endforeach; ?>
+    </table>
     @if(!$numVisible)
         <div class="d-flex align-items-baseline mr-1">
             <span class="text-secondary">-</span>
         </div>
     @endif
-    @if($numRelevant)
-        <div class="d-flex align-items-baseline text-info mr-1 mt-3">
-            <span class="text-sm mr-1"><i class="fa fa-star text-sm"></i></span>
-            <span class="text-sm">{{$plural}} relevant to this note</span>
-        </div>
-    @endif
 <?php endif; ?>

resources/views/app/patient/segment-templates/plan_medications/summary.blade.php

@@ -18,57 +18,60 @@ $plural = 'Medications';
 <?php if (!count($points)): ?>
     <div class="text-secondary">-</div>
 <?php else: ?>
-    <?php foreach ($points as $point): ?>
+    <table class="table table-bordered table-xs table-cage mb-0">
+        <?php $j = 0; foreach ($points as $point): $j++; ?>
         <?php if($point->is_removed && $point->is_removed_due_to_entry_error) continue; ?>
         <?php $rel = $point->relevanceToNote($note); ?>
         <?php $plan = $point->lastChildPlan; ?>
         <?php if($plan && @($plan->data)) $plan->data = json_decode($plan->data); ?>
         <?php $numVisible++; ?>
-        <div class="mb-2">
-            <div class="d-flex align-items-baseline">
+        <tr>
+            <td class="fit px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
                 @if($rel)
-                    <span class="text-info mr-1">
-                        <i class="fa fa-star"></i>
-                    </span>
                     <?php $numRelevant++; ?>
+                    {{ $j }}.*
+                @else
+                    {{ $j }}.
                 @endif
-                <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
-                    <b><?= !!@($point->data->name) ? @($point->data->name) : '-' ?></b>
+            </td>
+            <td class="px-2" style="max-width: 300px;">
+                <div class="font-weight-bold <?= $point->is_removed ? 'strike-through' : '' ?>">
+                    <?= !!@($point->data->name) ? @($point->data->name) : '-' ?>
                 </div>
-                <?php if ($point->is_removed): ?>
-                    @if($point->removal_reason_category === 'DURING_VISIT')
-                        <span class="ml-2 text-sm text-secondary">Removed during visit</span>
-                    @elseif($point->removal_reason_category === 'ON_INTAKE')
-                        <span class="ml-2 text-sm text-secondary">Removed on intake</span>
-                    @endif
-                <?php elseif ($point->added_in_note_id === $note->id): ?>
-                    <?php if ($point->addition_reason_category === 'DURING_VISIT'): ?>
-                        <span class="ml-2 text-sm text-success">* Prescribed during visit</span>
-                    <?php else: ?>
-                        <span class="ml-2 text-sm text-info">* Added on intake</span>
-                    <?php endif;?>
-                <?php endif; ?>
-            </div>
-            <?php if(!!$plan): ?>
-            <div class="pl-3 mt-1 d-flex align-items-baseline">
-                <span class="text-secondary font-weight-bold mr-2">Plan:</span>
-                <span>{!! $plan->data->value !!}</span>
-            </div>
-            <?php elseif($rel): ?>
-            <div class="relevant-without-plan text-warning-mellow text-sm mt-1" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Plan missing</div>
-            <?php endif; ?>
-        </div>
+            </td>
+            <td class="px-2" style="max-width:300px;">
+                <div>
+                    <?php if(!!$plan): ?>
+                    <div class="pl-3 mt-1 d-flex align-items-baseline">
+                        <span>{!! $plan->data->value !!}</span>
+                    </div>
+                    <?php elseif($rel): ?>
+                    <div class="relevant-without-plan text-warning-mellow text-sm mt-1" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Plan missing</div>
+                    <?php endif; ?>
+                </div>
+                <div class="d-flex align-items-baseline">                
+                    <?php if ($point->is_removed): ?>
+                        @if($point->removal_reason_category === 'DURING_VISIT')
+                            <span class="ml-2 text-sm text-secondary">Removed during visit</span>
+                        @elseif($point->removal_reason_category === 'ON_INTAKE')
+                            <span class="ml-2 text-sm text-secondary">Removed on intake</span>
+                        @endif
+                    <?php elseif ($point->added_in_note_id === $note->id): ?>
+                        <?php if ($point->addition_reason_category === 'DURING_VISIT'): ?>
+                            <span class="ml-2 text-sm text-success">* Prescribed during visit</span>
+                        <?php else: ?>
+                            <span class="ml-2 text-sm text-info">* Added on intake</span>
+                        <?php endif;?>
+                    <?php endif; ?>
+                </div>
+            </td>
+        </tr>
     <?php endforeach; ?>
+    </table>
     @if(!$numVisible)
         <div class="d-flex align-items-baseline mr-1">
             <span class="text-secondary">-</span>
         </div>
     @endif
-    @if($numRelevant)
-        <div class="d-flex align-items-baseline text-info mr-1 mt-3">
-            <span class="text-sm mr-1"><i class="fa fa-star text-sm"></i></span>
-            <span class="text-sm">{{$plural}} relevant to this note</span>
-        </div>
-    @endif
 <?php endif; ?>
 <?php endif; ?>

resources/views/app/patient/segment-templates/plan_problems/summary.blade.php

@@ -13,57 +13,60 @@ $plural = 'Problems';
 <?php if (!count($points)): ?>
     <div class="text-secondary">-</div>
 <?php else: ?>
-    <?php foreach ($points as $point): ?>
+    <table class="table table-bordered table-xs table-cage mb-0">
+    <?php $j = 0; foreach ($points as $point): $j++; ?>
         <?php if($point->is_removed && $point->is_removed_due_to_entry_error) continue; ?>
         <?php $rel = $point->relevanceToNote($note); ?>
         <?php $plan = $point->lastChildPlan; ?>
         <?php if($plan && @($plan->data)) $plan->data = json_decode($plan->data); ?>
         <?php $numVisible++; ?>
-        <div class="mb-2">
-            <div class="d-flex align-items-baseline">
+        <tr>
+            <td class="fit px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
                 @if($rel)
-                    <span class="text-info mr-1">
-                        <i class="fa fa-star"></i>
-                    </span>
                     <?php $numRelevant++; ?>
+                    {{ $j }}.*
+                @else
+                    {{ $j }}.
                 @endif
+            </td>
+            <td class="px-2" style="max-width: 300px;">
                 <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
                     <b><?= !!@($point->data->name) ? @($point->data->name) : '-' ?></b>
                 </div>
-                <?php if ($point->is_removed): ?>
-                    @if($point->removal_reason_category === 'DURING_VISIT')
-                        <span class="ml-2 text-sm text-secondary">Removed during visit</span>
-                    @elseif($point->removal_reason_category === 'ON_INTAKE')
-                        <span class="ml-2 text-sm text-secondary">Removed on intake</span>
-                    @endif
-                <?php elseif ($point->added_in_note_id === $note->id): ?>
-                    <?php if ($point->addition_reason_category === 'DURING_VISIT'): ?>
-                        <span class="ml-2 text-sm text-success">* Diagnosed during visit</span>
-                    <?php else: ?>
-                        <span class="ml-2 text-sm text-info">* Added on intake</span>
-                    <?php endif;?>
-                <?php endif; ?>
-            </div>
-            <?php if(!!$plan): ?>
-            <div class="pl-3 mt-1 d-flex align-items-baseline">
-                <span class="text-secondary font-weight-bold mr-2">Plan:</span>
-                <span>{!! $plan->data->value !!}</span>
-            </div>
-            <?php elseif($rel): ?>
-            <div class="relevant-without-plan text-warning-mellow text-sm mt-1" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Plan missing</div>
-            <?php endif; ?>
-        </div>
+            </td>
+            <td class="px-2" style="max-width:300px;">
+                <div>
+                    <?php if(!!$plan): ?>
+                        <div class="pl-3 mt-1 d-flex align-items-baseline">
+                            <span>{!! $plan->data->value !!}</span>
+                        </div>
+                    <?php elseif($rel): ?>
+                        <div class="relevant-without-plan text-warning-mellow text-sm mt-1" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Plan missing</div>
+                    <?php endif; ?>
+                </div>
+                <div class="d-flex align-items-baseline">
+                    <?php if ($point->is_removed): ?>
+                        @if($point->removal_reason_category === 'DURING_VISIT')
+                            <span class="ml-2 text-sm text-secondary">Removed during visit</span>
+                        @elseif($point->removal_reason_category === 'ON_INTAKE')
+                            <span class="ml-2 text-sm text-secondary">Removed on intake</span>
+                        @endif
+                    <?php elseif ($point->added_in_note_id === $note->id): ?>
+                        <?php if ($point->addition_reason_category === 'DURING_VISIT'): ?>
+                            <span class="ml-2 text-sm text-success">* Diagnosed during visit</span>
+                        <?php else: ?>
+                            <span class="ml-2 text-sm text-info">* Added on intake</span>
+                        <?php endif;?>
+                    <?php endif; ?>
+                </div>
+            </td>
+        </tr>
     <?php endforeach; ?>
+    </table>
     @if(!$numVisible)
         <div class="d-flex align-items-baseline mr-1">
             <span class="text-secondary">-</span>
         </div>
     @endif
-    @if($numRelevant)
-        <div class="d-flex align-items-baseline text-info mr-1 mt-3">
-            <span class="text-sm mr-1"><i class="fa fa-star text-sm"></i></span>
-            <span class="text-sm">{{$plural}} relevant to this note</span>
-        </div>
-    @endif
 <?php endif; ?>