diff --git a/templates/query-result.hamlet b/templates/query-result.hamlet
index 847a321..a36c2ef 100644
--- a/templates/query-result.hamlet
+++ b/templates/query-result.hamlet
@@ -1,10 +1,18 @@
 <div .subm-commit>#{commitSha1AsText}
 <div .subm-description>#{submissionDescription $ fsiSubmission submission}
-<div .subm-user>#{submitter}
-<div .subm-stamp>#{stamp}
-<div .subm-repo>taken from: <code>#{repoUrl $ fsiRepo submission}</code> / branch <code>#{repoBranch $ fsiRepo submission}</code>
-$if submissionIsPublic $ fsiSubmission submission
-  <div .subm-repo>publicly available at: <code>#{publicSubmissionRepo}</code> / branch <code>#{publicSubmissionBranch}</code>
-  <div .subm-browsable>browsable at: <a href="#{browsableUrl}">#{browsableUrl}</a>
-  <div .subm-clonable>to get it run: <code>git clone --single-branch #{publicSubmissionRepo} -b #{publicSubmissionBranch}</code>
+<p>&nbsp;</p>
+<dl class="dl-horizontal">
+  <dt>submitter
+  <dd>#{submitter}
+  <dt>submitted
+  <dd>#{stamp}
+  <dt>original repo
+  <dd><code>#{repoUrl $ fsiRepo submission}</code> / branch <code>#{repoBranch $ fsiRepo submission}</code>
+  $if submissionIsPublic $ fsiSubmission submission
+    <dt>publicly available at
+    <dd><code>#{publicSubmissionRepo}</code> / branch <code>#{publicSubmissionBranch}</code>
+    <dt>browsable at
+    <dd><a href="#{browsableUrl}">#{browsableUrl}</a>
+    <dt>clone by
+    <dd><code>git clone --single-branch #{publicSubmissionRepo} -b #{publicSubmissionBranch}</code>
 <hr>