diff --git a/internal_packages/message-list/lib/message-timestamp.cjsx b/internal_packages/message-list/lib/message-timestamp.cjsx
index 1f0975506..7effc51a8 100644
--- a/internal_packages/message-list/lib/message-timestamp.cjsx
+++ b/internal_packages/message-list/lib/message-timestamp.cjsx
@@ -33,7 +33,7 @@ class MessageTimestamp extends React.Component
       if diff < 1
         return "h:mm a"
       if diff < 4
-        return "MMM D, h:mm a"
+        return "MMM D"
       else if diff > 1 and diff <= 365
         return "MMM D"
       else
diff --git a/internal_packages/message-list/spec/message-timestamp-spec.cjsx b/internal_packages/message-list/spec/message-timestamp-spec.cjsx
index 322921fc8..87b99cb43 100644
--- a/internal_packages/message-list/spec/message-timestamp-spec.cjsx
+++ b/internal_packages/message-list/spec/message-timestamp-spec.cjsx
@@ -17,17 +17,21 @@ describe "MessageTimestamp", ->
     spyOn(@item, "_today").andCallFake -> testDate().add(2, 'years')
     expect(@item._timeFormat()).toBe "MMM D YYYY"
 
-  it "displays the time and date from messages a bit ago", ->
+  it "displays the time and date from a while ago", ->
+    spyOn(@item, "_today").andCallFake -> testDate().add(7, 'days')
+    expect(@item._timeFormat()).toBe "MMM D"
+
+  it "displays the time and date from messages a couple days ago", ->
     spyOn(@item, "_today").andCallFake -> testDate().add(2, 'days')
-    expect(@item._timeFormat()).toBe "MMM D, h:mm a"
+    expect(@item._timeFormat()).toBe "MMM D"
 
   it "displays the time and date messages exactly a day ago", ->
     spyOn(@item, "_today").andCallFake -> testDate().add(1, 'day')
-    expect(@item._timeFormat()).toBe "MMM D, h:mm a"
+    expect(@item._timeFormat()).toBe "MMM D"
 
   it "displays the time from messages yesterday with the day, even though it's less than 24 hours ago", ->
     spyOn(@item, "_today").andCallFake -> moment([2010, 1, 15, 2, 25, 50, 125])
-    expect(@item._timeFormat()).toBe "MMM D, h:mm a"
+    expect(@item._timeFormat()).toBe "MMM D"
 
   it "displays the time from messages recently", ->
     spyOn(@item, "_today").andCallFake -> testDate().add(2, 'hours')
diff --git a/static/components/tokenizing-text-field.less b/static/components/tokenizing-text-field.less
index 2a9e9b191..cdc5788d6 100644
--- a/static/components/tokenizing-text-field.less
+++ b/static/components/tokenizing-text-field.less
@@ -92,7 +92,7 @@
       width: initial;
       vertical-align:top;
       border: none;
-      min-width: 5em;
+      min-width: 0.5em;
       background-color:transparent;
 
       // NOTE: padding-top and padding-bottom need to match that of