diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
index deb1d3d7c68eea05bdba35dfd0754e8d0425ca87..ce033e61470b098aa8af5a2b6453d828c3f79b9a 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
@@ -200,9 +200,9 @@ function SelectColumnFilter({
   return (
     <div onClick={e => { e.stopPropagation() }}>
       <select
+        className= {columnclassname[0][Header]}
         style={{
           height: '24.2014px',
-          width: '60px',
           border: '1px solid lightgrey',
         }}
         value={value}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
index 35b2e1b90213ccb845666b55c99a4db7fcaa5a5e..bde5bec242b207a22b7fffeb07f388ff0ca9c010 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
@@ -269,39 +269,34 @@ class SchedulingUnitList extends Component{
     }
 
     getAPIFilter(suFilters, columnDef) {
-        let defaultColumsProps = columnDef;
         const defaultColKeys = Object.keys(columnDef);
         defaultColKeys.forEach(key => {
             let tmpColMap = {};
             let tempKey = key;
             tmpColMap['orgField'] = tempKey;
             tmpColMap['tmpField'] = tempKey;
-           
             if(key === 'suid') {
                 tempKey = 'id';
                 tmpColMap['orgField'] = tempKey;
                 tmpColMap['tmpField'] = 'suid';
             }
-            let defaulColumn = defaultColumsProps[key];
-            if(defaulColumn) {
-                tmpColMap['displayName'] = defaulColumn['name'];
+            if(columnDef[key]) {
+                tmpColMap['displayName'] = columnDef[key]['name'];
             }
             this.columnMap.push(tmpColMap);
-            let filter = suFilters.data.filters[tempKey];
-            if(filter) {
-                defaultColumsProps[key]['disableSortBy'] = !_.includes(suFilters.data.ordering, tempKey);
-                defaultColumsProps[key]['disableFilters'] = false;
-                if(UIConstants.FILTER_MAP[filter.type]) {
-                    defaultColumsProps[key]['filter'] = UIConstants.FILTER_MAP[filter.type];
+            //Set Enable/Disable the Filter & SortBy in each column
+            if(suFilters.data.filters[tempKey]) {
+                columnDef[key]['disableSortBy'] = !_.includes(suFilters.data.ordering, tempKey);
+                columnDef[key]['disableFilters'] = false;
+                if(UIConstants.FILTER_MAP[suFilters.data.filters[tempKey].type]) {
+                    columnDef[key]['filter'] = UIConstants.FILTER_MAP[suFilters.data.filters[tempKey].type];
                 }
-            }   else {
-               if (defaultColumsProps[key]['name']) {
-                    defaultColumsProps[key]['disableSortBy'] = true;
-                    defaultColumsProps[key]['disableFilters'] = true;
-               } 
+            }   else if (columnDef[key]['name']) {
+                columnDef[key]['disableSortBy'] = true;
+                columnDef[key]['disableFilters'] = true;
             }
         });
-        return defaultColumsProps;
+        return columnDef;
     }
 
     /**