diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index 5819f5bd4a..715e421121 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -1820,6 +1820,33 @@ li.expanded_subject {
 #bots_list {
     display: none;
     font-size: 90%;
+    list-style-type: none;
+    width: 550px;
+    margin-left: 0px;
+}
+
+#bots_list .image, 
+#bots_list .bot_info {
+    display: inline-block;
+    margin: 10px;
+}
+
+#bots_list .image {
+    vertical-align: top;
+}
+
+#bots_list .name {
+    font-weight: bold;
+    font-size: 130%;
+}
+
+#bots_list .field:after {
+    content: ':';
+}
+
+.bot_info .field {
+    width: 7em;
+    display: inline-block;
 }
 
 #create_bot_form .control-label {
@@ -1841,7 +1868,7 @@ li.expanded_subject {
 }
 
 #create_bot_short_name {
-    width: 10em;
+    width: 7em;
 }
 
 .bot_name_header {
@@ -1853,7 +1880,8 @@ li.expanded_subject {
     width: 35px;
 }
 
-.api_key {
+#bots_list .email .value,
+#bots_list .api_key .value {
     font-family: monospace;
     font-size: 85%;
 }
diff --git a/zephyr/static/templates/bot_avatar_row.handlebars b/zephyr/static/templates/bot_avatar_row.handlebars
index 5fbb24b6a0..240a63e717 100644
--- a/zephyr/static/templates/bot_avatar_row.handlebars
+++ b/zephyr/static/templates/bot_avatar_row.handlebars
@@ -1,6 +1,16 @@
 <li>
-	<span><img src="{{avatar_url}}" class=avatar></span>
-	<span>{{name}}</span>
-	<span>{{email}}</span>
-	<span class="api_key">{{api_key}}</span>
+	<div class="image">
+		<img src="{{avatar_url}}" class=avatar>
+	</div>
+	<div class="bot_info">
+		<div class="name">{{name}}</div>
+		<div class="email">
+			<span class="field">Email</span>
+			<span class="value">{{email}}</span>
+		</div>
+		<div class="api_key">
+			<span class="field">API Key</span>
+			<span class="value">{{api_key}}</e>
+		</div>
+	</div>
 </li>
\ No newline at end of file