diff --git a/inventory/static/js/components/markdown.js b/inventory/static/js/components/markdown.js
index 29c8cbc..9d18065 100644
--- a/inventory/static/js/components/markdown.js
+++ b/inventory/static/js/components/markdown.js
@@ -20,6 +20,12 @@ const MarkDown = {
         for (const q of root.querySelectorAll('blockquote')) {
             q.classList.add('blockquote', 'border-start', 'border-5', 'border-success', 'mt-3', 'ps-3');
         }
+        for (const l of root.querySelectorAll('ul')) {
+            l.classList.add('list-group');
+        }
+        for (const l of root.querySelectorAll('li')) {
+            l.classList.add('list-group-item');
+        }
     },
 
     renderInto(el, md) {
diff --git a/inventory/templates/crudkit/field.html b/inventory/templates/crudkit/field.html
index 1179f1c..4ca1420 100644
--- a/inventory/templates/crudkit/field.html
+++ b/inventory/templates/crudkit/field.html
@@ -1,4 +1,4 @@
-{# show label unless hidden/custom #}
+<!-- FIELD: {{ field_name }} ({{ field_type }}) -->
 {% if field_type != 'hidden' and field_label %}
   <label for="{{ field_name }}"
     {% if label_attrs %}{% for k,v in label_attrs.items() %}
@@ -15,6 +15,7 @@
 {% endif %}
 
 {% if field_type == 'select' %}
+{#
   <select name="{{ field_name }}" id="{{ field_name }}"
           {% if attrs %}{% for k,v in attrs.items() %}
             {{k}}{% if v is not sameas true %}="{{ v }}"{% endif %}
@@ -31,6 +32,13 @@
       <option value="">-- No selection available --</option>
     {% endif %}
   </select>
+#}
+  {% if value %}
+    {% set sel_label = (options | selectattr('value', 'equalto', value) | first)['label'] %}
+  {% else %}
+    {% set sel_label = "-- Select --" %}
+  {% endif %}
+  <button type="button" class="btn btn-outline-secondary d-block w-100" id="{{ field_name }}-button" data-value="{{ value }}">{{ sel_label }}</button>
 
 {% elif field_type == 'textarea' %}
   <textarea name="{{ field_name }}" id="{{ field_name }}"