diff --git a/public/legacy/modules/SugarFeed/tpls/AdminSettings.tpl b/public/legacy/modules/SugarFeed/tpls/AdminSettings.tpl
index 5ce75f58f..70b9e9de5 100755
--- a/public/legacy/modules/SugarFeed/tpls/AdminSettings.tpl
+++ b/public/legacy/modules/SugarFeed/tpls/AdminSettings.tpl
@@ -46,7 +46,6 @@
 <input type="hidden" name="action" value="AdminSettings">
 <input type="hidden" name="module" value="SugarFeed">
 <input type="hidden" name="process" value="">
-
 <table width="100%" cellpadding="0" cellspacing="0" border="0" class="actionsContainer">
 <tr>
 <td width="100%" colspan="2" class="action-button">
@@ -56,42 +55,40 @@
 </td>
 </tr>
 </table>
-
-<table width="100%" border="0" cellspacing="1" cellpadding="0" class="edit view">
-<tr>
-<td scope="row" align="right" nowrap>{$mod.LBL_ENABLE_FEED}:</td>
-<td align="left" width="25%" colspan='4'>
-<input type="hidden" id="feed_enable_hidden" name="feed_enable" value="0">
-<input type="checkbox" id="feed_enable" name="feed_enable" value="1" {$enabled_checkbox} onClick="SugarFeedDisableCheckboxes()">
-</td>
-</tr>
-<tr>
-<td scope="row" align="right" valign="top" nowrap>{$mod.LBL_ENABLE_MODULE_LIST}:</td>
-<td colspan="4" width="95%">
-<table id="sugarfeed_modulelist" cellspacing=3 border=0>
-{foreach name=feedModuleList from=$module_list key=i item=entry}
-{if ($i % 2)==0}<tr>{/if}
-<td scope="row" align="right">{$entry.label}:</td>
-<td>
-<input type="hidden" name="modules[module_{$entry.module}]" value="0">
-<input type="checkbox" id="modules[module_{$entry.module}]" name="modules[module_{$entry.module}]" value="1" {if $entry.enabled==1}CHECKED{/if}>
-</td>
-{if ($i % 2)==1}</tr>{/if}
-{/foreach}
-</table>
-</td></tr>
-<tr>
-<td scope="row" align="right" nowrap>{$mod.LBL_ENABLE_USER_FEED}:</td>
-<td align="left" width="25%">
-<input type="hidden" id="modules[module_UserFeed]" name="modules[module_UserFeed]" value="0">
-<input type="checkbox" id="modules[module_UserFeed]" name="modules[module_UserFeed]" value="1" {if $user_feed_enabled==1}CHECKED{/if}>
-</td>
-<td colspan="3" width="70%">&nbsp;</td>
-</tr>
-</table>
+<div class="activity-stream-container">
+   <div class="activity-box-enable">
+      <div class="activity-left-label-enable">{$mod.LBL_ENABLE_FEED}:</div>
+      <div class="activity-right-label-enable">
+         <input type="hidden" id="feed_enable_hidden" name="feed_enable" value="0">
+         <input type="checkbox" id="feed_enable" name="feed_enable" value="1" {$enabled_checkbox} onClick="SugarFeedDisableCheckboxes()">
+      </div>
+   </div>
+   <div class="activity-box">
+      <div class="activity-left-label">{$mod.LBL_ENABLE_MODULE_LIST}:</div>
+      <div class="activity-right-label">
+         <div id="sugarfeed_modulelist" cellspacing=3 border=0>
+         {foreach name=feedModuleList from=$module_list key=i item=entry}
+         {if ($i % 2)==0}<div class="activate-feed">{/if}
+         <span scope="row" align="right" style="padding-right: 3em;">{$entry.label}:</span>
+         <span style="padding-right: 4em;
+    padding-left: 4em;">
+         <input type="hidden" name="modules[module_{$entry.module}]" value="0">
+         <input type="checkbox" id="modules[module_{$entry.module}]" name="modules[module_{$entry.module}]" value="1" {if $entry.enabled==1}CHECKED{/if}>
+         </span>
+         {if ($i % 2)==1}</div>{/if}
+         {/foreach}
+         </div>
+      </div>
+   </div>
+   <div class="activity-box-feed">
+      <div class="activity-left-label-feed">{$mod.LBL_ENABLE_USER_FEED}:</div>
+      <div class="activity-right-label-feed">
+         <input type="hidden" id="modules[module_UserFeed]" name="modules[module_UserFeed]" value="0">
+         <input type="checkbox" id="modules[module_UserFeed]" name="modules[module_UserFeed]" value="1" {if $user_feed_enabled==1}CHECKED{/if}>
+      </div>
+   </div>
+</div>
 </form>
-
-
 <script type="text/javascript">
 var SugarFeedCheckboxList = new Object();
 SugarFeedCheckboxList['module_UserFeed'] = 'modules[module_UserFeed]';
diff --git a/public/legacy/themes/suite8/css/suitep-base/activity-stream.scss b/public/legacy/themes/suite8/css/suitep-base/activity-stream.scss
index 7d007a6de..ea1fd4a0b 100644
--- a/public/legacy/themes/suite8/css/suitep-base/activity-stream.scss
+++ b/public/legacy/themes/suite8/css/suitep-base/activity-stream.scss
@@ -3,6 +3,7 @@
     .moduleTitle {
         border-bottom: 1px solid lightgrey;
         margin-bottom: 1em;
+        max-width: 100%;
     }
     .actionsContainer {
         position: absolute;
@@ -24,13 +25,71 @@
                 background: $pale-blue;
             }
         }
-    }
-    table.view {
+    }  
+    .activity-stream-container {
+        line-height: 3em;
+        background: $white;
         border-radius: 10px;
-        tr td {  
-            padding-left: 1em;
-            padding-top: 0.5em;
-            vertical-align: middle;
+        padding: 1em;
+        .activity-box-enable { 
+            display: flex;
+            .activity-left-label-enable {
+                width: 22.3%;
+                @media (min-width: 768px) and (max-width: 1024px) {
+                    width: 36%;
+                }                
+                @media (min-width: 320px) and (max-width: 480px) { //for mobile 
+                    min-width: 17em;
+                }
+                @media (min-width: 480px) and (max-width: 767px) { 
+                    width: 100%;
+                }
+            }
+            .activity-right-label-enable {
+                width: 82%;
+            }
+        } 
+        .activity-box {            
+            @media (max-width: 750px) {
+                display: block;
+            }
+            .activity-left-label {
+            @media (max-width: 750px) {
+                white-space: nowrap;
+            }
+            }
+            .activity-right-label {
+                width: 82%;
+                @media (min-width: 320px) and (max-width: 480px) {
+                    margin-left: 1em;
+                }
+                @media (min-width: 480px) and (max-width: 767px) {
+                    margin-left: 1em;
+                }
+            }
+        }
+        .activity-box-feed {
+            display: flex;
+            .activity-left-label-feed {
+                width: 22.3%;
+                @media (min-width: 320px) and (max-width: 480px) {
+                    min-width: 17em;
+                }
+                @media (min-width: 480px) and (max-width: 767px) {
+                    width: 100%;
+                }
+            }
+            .activity-right-label-feed {
+                width: 82%;
+            }
+        }
+        span[scope="row"] {
+            width: 7%;
+            display: inline-block;
+            text-align: left;   
+            @media (min-width: 320px) and (max-width: 480px) {
+                width: 50%;
+            }        
         }
     }
 }
\ No newline at end of file