diff --git a/static/css/screenly.css b/static/css/screenly.css
index 881be437..ac14a03a 100644
--- a/static/css/screenly.css
+++ b/static/css/screenly.css
@@ -211,11 +211,12 @@ input[name="file_upload"] {
   white-space: nowrap;
   text-overflow: ellipsis;
   overflow: hidden;
-  max-width: 320px;
-  min-width: 320px; }
+  max-width: 290px;
+  min-width: 290px; }
 
 .asset_row_btns {
-  padding: 6px 8px 10px 8px !important; }
+  padding: 6px 8px 10px 8px !important;
+  white-space: nowrap; }
 
 .table td {
   vertical-align: middle !important; }
diff --git a/static/sass/screenly.scss b/static/sass/screenly.scss
index 42bfc3a4..baef9284 100644
--- a/static/sass/screenly.scss
+++ b/static/sass/screenly.scss
@@ -252,10 +252,13 @@ input[name="file_upload"] {
 #inactive-assets img { display: none; }
 .asset_row_name {
     @include ellip();
-    max-width: 320px;
-    min-width: 320px;
+    max-width: 290px;
+    min-width: 290px;
+}
+
+.asset_row_btns { padding: 6px 8px 10px 8px !important;
+    white-space: nowrap;
 }
-.asset_row_btns { padding: 6px 8px 10px 8px !important; }
 
 .table {
   td { 
diff --git a/templates/index.html b/templates/index.html
index a8d4ab5f..3f74a069 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -8,7 +8,7 @@
     {% else %}
       <title>Screenly OSE</title>
     {% endif %}
-      
+
     <link href="/static/favicons/apple-touch-icon-57x57.png" rel="apple-touch-icon-precomposed" sizes="57x57" />
     <link href="/static/favicons/apple-touch-icon-114x114.png" rel="apple-touch-icon-precomposed" sizes="114x114" />
     <link href="/static/favicons/apple-touch-icon-72x72.png" rel="apple-touch-icon-precomposed" sizes="72x72" />
@@ -78,7 +78,7 @@
       <td style="width:21%">
         <%= end_date %>
       </td>
-      <td class="asset_row_btns" style="width:20%">
+      <td class="asset_row_btns">
         <button class="download-asset-button btn" type="button">
           <i class="icon-download-alt"></i>
         </button>
@@ -397,7 +397,7 @@
                   <th class="asset_row_name">Name</th>
                   <th style="width:21%">Start</th>
                   <th style="width:21%">End</th>
-                  <th style="width:20%"></th>
+                  <th style="width:13%"></th>
                   <th style="width:7%"></th>
                 </tr>
               </thead>