diff --git a/css/style.css b/css/style.css
index a9f2a48..0255598 100644
--- a/css/style.css
+++ b/css/style.css
@@ -109,12 +109,10 @@ dd {
 /* hackcal */
 #dbkcalendar {border: 1px solid #CCC}
 #dbkcalendar div {display: flex; padding: 8px 14px}
-#dbkcalendar div span:first-child {font-weight: bold}
-#dbkcalendar [data-date] {background: #CCC}
-#dbkcalendar [data-date] span:first-child {flex: 1}
+#dbkcalendar [data-date] {background: #CCC; font-weight: bold}
 #dbkcalendar [data-uid] {font-size: .9em; gap: .5em; line-height: 1.5em}
-#dbkcalendar [data-uid] span:first-child {flex: 0 0 3em}
-#dbkcalendar div i {background: #FC0; border-radius: 0.25em; padding: 0 0.25em; font-style: normal; font-weight: bold; color:#000}
+#dbkcalendar [data-uid] span:first-child {flex: 0 0 3em; font-weight: bold}
+#dbkcalendar i {background: #FC0; border-radius: 0.25em; padding: 0 0.25em; font-style: normal; font-weight: bold; color:#000}
 
 /* spaceapi */
 aside#spaceapi {
diff --git a/js/vanilla.dbkcalendar.js b/js/vanilla.dbkcalendar.js
index 4dc2470..463b980 100644
--- a/js/vanilla.dbkcalendar.js
+++ b/js/vanilla.dbkcalendar.js
@@ -14,10 +14,10 @@ function hackcal(p=1) {
             items.push("<div data-date='" + date + "'><span>" + day.toLocaleDateString(true, {weekday:'short', day:'numeric', month:'long', year: 'numeric'}) + "</span></div>");
             Object.keys(data[date]).forEach(function (uid) {
                 var event = data[date][uid];
-                if(event.location) event.location = event.location.replace(/\n/g,"<br>").replace(uri_regex, "<a href='$1' target='_blank'>$1</a>");
-                if(event.description) event.description = event.description.replace(/\n/g,"<br>").replace(uri_regex, (url) => {event.summary = `<a href='${url}' target='_blank'>${event.summary}</a>`; return "";});
-                if(event.categories) event.categories = "<i>" + event.categories.replace(",", "</i> <i>") + "</i>";
-                items.push("<div data-uid='" + uid + "'><span>" + event.datestr + "</span><span><b>" + event.summary + "</b> | " + ((event.location)?event.location:'') + "<br/>" + ((event.description)?event.description:'') + ((event.categories)?event.categories:'') + "</span></div>");
+                var location = (event.location)?event.location.replace(/\n/g,"<br>").replace(uri_regex, "<a href='$1' target='_blank'>$1</a>"):'';
+                var description = (event.description)?event.description.replace(/\n/g,"<br>").replace(uri_regex, (url) => {event.summary = `<a href='${url}' target='_blank'>${event.summary}</a>`; return "";}):'';
+                var categories = (event.categories)?"<i>" + event.categories.replace(",", "</i> <i>") + "</i>":'';
+                items.push("<div data-uid='" + uid + "'><span>" + event.datestr + "</span><span><b>" + event.summary + "</b> | " + location + "<br/>" + description + categories + "</span></div>");
             });
         });
         document.querySelector('#dbkcalendar').innerHTML = items.join( "" );