-<br>
-<label for="remidy">$(l10n remidy)</label>
-<span id="remidy">${mpx[remidy]}</span>
-<br>
-<label for="quantity">$(l10n quantity)</label>
-<span id="quantity">${mpx[quantity]}</span>
-<br>
-<label for="quantity_weekly">$(l10n quantity_weekly)</label>
-<span id="quantity_weekly">${mpx[quantity_weekly]}</span>
-
-<br>
-<label for="remidy1">$(l10n remidy)</label>
-<span id="remidy1">${mpx[remidy1]}</span>
-<br>
-<label for="quantity1">$(l10n quantity)</label>
-<span id="quantity1">${mpx[quantity1]}</span>
-<br>
-<label for="quantity_weekly1">$(l10n quantity_weekly)</label>
-<span id="quantity_weekly1">${mpx[quantity_weekly1]}</span>
+<fieldset class="description">
+ <label for="quantity">$(l10n quantity)</label>
+ <label for="remidy">$(l10n remidy)</label>
+ <label for="quantity_weekly">$(l10n quantity_weekly)</label>
+ <span id="quantity">${mpx[quantity]}</span>
+ <span id="remidy">${mpx[remidy]}</span>
+ <span id="quantity_weekly">${mpx[quantity_weekly]}</span>
+$( for n in {0..10}; do
+ [ -n "${mpx[quantity$n]}" -o -n "${mpx[remidy$n]}" -o -n "${mpx[quantity_weekly$n]}" ] \
+ && printf '
+ <span id="quantity">%s</span>
+ <span id="remidy">%s</span>
+ <span id="quantity_weekly">%s</span>
+ ' "${mpx[quantity$n]}" "${mpx[remidy$n]}" "${mpx[quantity_weekly$n]}"
+done )
+<br>
+<p class="indicator_codes">
+ <label for="indicator">$(l10n indicator)</label>
+ <span id="indicator">${mpx[indicator]}</span>
+ <br>
+ <label for="icd10">$(l10n icd10)</label>
+ <span id="icd10">${mpx[icd10]}</span>
+</p>
+<br>
+<p class="indicator_reading">
+ <label for="indicator_reading">$(l10n indicator_reading)</label>
+ <span id="indicator_reading">${mpx[indicator_reading]}</span>
+</p>
+</fieldset>