diff --git a/akvo/rsr/spa/app/components/AllSubmissionsModal.jsx b/akvo/rsr/spa/app/components/AllSubmissionsModal.jsx
index 481266581a..b07ee78397 100644
--- a/akvo/rsr/spa/app/components/AllSubmissionsModal.jsx
+++ b/akvo/rsr/spa/app/components/AllSubmissionsModal.jsx
@@ -1,75 +1,90 @@
-/* global document */
 import React from 'react'
-import { Modal } from 'antd'
+import { Modal, Row, Col, Tag, Badge } from 'antd'
 import moment from 'moment'
 import SVGInline from 'react-svg-inline'
+import { groupBy, isEmpty } from 'lodash'
+import classNames from 'classnames'
 import { nicenum } from '../utils/misc'
 import statusPending from '../images/status-pending.svg'
 import statusApproved from '../images/status-approved.svg'
 import statusRevision from '../images/status-revision.svg'
 
-export const AllSubmissionsModal = ({ visible, onCancel, period }) => {
-  let width = 460
-  if (period.disaggregations) {
-    width += period.disaggregations.length * 100
+const StatusIcon = ({ status }) => {
+  if (status === 'A') {
+    return <SVGInline svg={statusApproved} />
   }
-  if (width > document.body.clientWidth - 100) {
-    width = document.body.clientWidth - 100
+  if (['D', 'P'].includes(status)) {
+    return <SVGInline svg={statusPending} />
   }
+  if (status === 'R') {
+    return <SVGInline svg={statusRevision} />
+  }
+  return null
+}
+
+export const AllSubmissionsModal = ({
+  visible,
+  onCancel,
+  updates,
+  width = 520,
+  activeKeys = [],
+  dsgOnly = false,
+}) => {
+  const _updates = updates?.filter((u) => (
+    (dsgOnly && u?.disaggregations?.length) ||
+    (!dsgOnly)
+  ))
   return (
     <Modal {...{ visible, onCancel, width }} title="Period latest submissions" footer={null} className="all-submissions-modal">
-      <table>
-        {period.updates.map(update => {
-          const dsgGroups = {}
-          update.disaggregations.forEach(item => {
-            if (!dsgGroups[item.category]) dsgGroups[item.category] = []
-            dsgGroups[item.category].push(item)
-            if (period.disaggregationTargets.length > 0) {
-              const target = period.disaggregationTargets.find(it => it.typeId === item.typeId)
-              if (target != null) dsgGroups[item.category][dsgGroups[item.category].length - 1].targetValue = target.value
-            }
-          })
-          const dsgKeys = Object.keys(dsgGroups)
+      <div>
+        {_updates?.map(update => {
+          const _disaggregations = update?.disaggregations?.filter((dg) => activeKeys?.includes(dg?.type))
+          const dsgGroups = groupBy(_disaggregations, 'category')
+          const userName = (
+            isEmpty(update?.userDetails?.firstName) &&
+            isEmpty(update?.userDetails?.lastName)
+          )
+            ? update?.userDetails?.email
+            : `${update.userDetails.firstName} ${update.userDetails.lastName}`
           return (
-            <tr>
-              <td>
+            <Row type="flex" justify="space-between" align="middle" key={update.id}>
+              <Col xs={24}>
                 <div className="svg-text">
-                  <SVGInline svg={update.status === 'A' ? statusApproved : update.status === 'P' ? statusPending : statusRevision} />
+                  <StatusIcon status={update?.status} />
                   <div className="text">
-                    {update.userDetails.firstName} {update.userDetails.lastName}
+                    {userName}
                     <span className="date">{moment(update.createdAt).format('DD MMM YYYY')}</span>
                   </div>
                 </div>
-              </td>
-              <td className="spacer">&nbsp;</td>
-              {dsgKeys.map(dsgKey => [
-                <td>
-                  <div className="dsg-group">
-                    <div className="h-holder">
-                      <h5>{dsgKey}</h5>
-                    </div>
-                    <ul>
-                      {dsgGroups[dsgKey].map((dsg) => [
-                        <li>
-                          <div className="label">{dsg.type}</div>
+              </Col>
+              <Col xs={24} className="dsg-tags">
+                {
+                  Object.keys(dsgGroups).map((dsgKey, dx) => (
+                    <div key={dx}>
+                      <h6>{dsgKey}</h6>
+                      {dsgGroups[dsgKey]?.map((dsg, ix) => (
+                        <Tag key={ix}>
                           <div>
-                            <b>{nicenum(dsg.value)}</b>
-                            {dsg.targetValue && <b> ({Math.round(((dsg.value / dsg.targetValue) * 100 * 10) / 10)}%)</b>}
+                            {dsg?.type}
                           </div>
-                        </li>
-                      ])}
-                    </ul>
-                  </div>
-                </td>
-              ])}
-              <td>
-                <div className="value">{nicenum(update.value)}</div>
-              </td>
-            </tr>
+                          <div>
+                            <Badge count={dsg?.value} className={classNames('badge', { [update?.status]: true })} showZero />
+                          </div>
+                        </Tag>
+                      ))}
+                    </div>
+                  ))
+                }
+              </Col>
+              <Col xs={24}>
+                <h6>Value</h6>
+                <div className={classNames('value', { [update?.status]: true })}>{nicenum(update.value)}</div>
+              </Col>
+            </Row>
           )
         }
         )}
-      </table>
+      </div>
     </Modal>
   )
 }
diff --git a/akvo/rsr/spa/app/components/UpdatesHistory.jsx b/akvo/rsr/spa/app/components/UpdatesHistory.jsx
index 4b293d58e2..673f2847d4 100644
--- a/akvo/rsr/spa/app/components/UpdatesHistory.jsx
+++ b/akvo/rsr/spa/app/components/UpdatesHistory.jsx
@@ -1,15 +1,19 @@
-import React from 'react'
+import React, { useState } from 'react'
 import {
   Row,
   Col,
   Collapse,
   Table,
   Tooltip,
+  Button,
+  Icon,
 } from 'antd'
 import classNames from 'classnames'
+import isEqual from 'lodash/isEqual'
 
 import ExpandIcon from './ExpandIcon'
 import { toCapitalize } from '../utils/string'
+import { AllSubmissionsModal } from './AllSubmissionsModal'
 
 const { Panel } = Collapse
 const { Column } = Table
@@ -30,9 +34,14 @@ const setColumns = (value, key) => ({
 const UpdatesHistory = ({
   columns,
   tables,
+  updates,
+  disaggregations,
+  disaggregationTargets,
   activeKeys = DEFAULT_ACTIVE_KEYS,
   mneView = false,
 }) => {
+  const [visible, setVisible] = useState(false)
+
   const getActiveKeys = (value) => activeKeys?.length
     ? [...activeKeys, ...DEFAULT_ACTIVE_KEYS]?.includes(value)
     : value
@@ -68,11 +77,33 @@ const UpdatesHistory = ({
   const tableProps = mneView ? { pagination: false, scroll: { x: 500 } } : { pagination: false }
   return (
     <Row>
-      <Col>
+      <Col className="table-history-sm">
+        <Tooltip title="Updates history">
+          <Button type="link" onClick={() => setVisible(true)}>
+            <Icon type="unordered-list" />
+          </Button>
+        </Tooltip>
+        <AllSubmissionsModal
+          {...{
+            visible,
+            updates,
+            activeKeys,
+            disaggregations,
+            disaggregationTargets,
+          }}
+          onCancel={() => setVisible(false)}
+          dsgOnly={!(isEqual(activeKeys, DEFAULT_ACTIVE_KEYS))}
+        />
+      </Col>
+      <Col className="table-history-md">
         <Collapse
           bordered={false}
           expandIconPosition="right"
-          expandIcon={({ isActive }) => <ExpandIcon isActive={isActive} open="close" close="unordered-list" />}
+          expandIcon={({ isActive }) => (
+            <Tooltip title="Updates history">
+              <ExpandIcon isActive={isActive} open="close" close="unordered-list" />
+            </Tooltip>
+          )}
           className="collapse-history"
         >
           <Panel>
diff --git a/akvo/rsr/spa/app/images/status-pending.svg b/akvo/rsr/spa/app/images/status-pending.svg
index c2ebb4aed7..d63382c455 100644
--- a/akvo/rsr/spa/app/images/status-pending.svg
+++ b/akvo/rsr/spa/app/images/status-pending.svg
@@ -1 +1 @@
-<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 296 305"><defs><style>.cls-1{fill:none;}.cls-2{fill:#e36f3c;stroke:#e36f3c;}.cls-2,.cls-3{stroke-width:1px;}.cls-3,.cls-4{fill:#e36f3c;}.cls-3{stroke:#e36f3c;}</style></defs><path class="cls-1" d="M88.09,17.33a46.76,46.76,0,0,1,40.17-10l83.83,18.34A46.72,46.72,0,0,1,244,50.44l40,80.08a46.76,46.76,0,0,1,.93,39.8l-35.55,80.37a46.76,46.76,0,0,1-31.43,26.44l-82.41,20.55a46.74,46.74,0,0,1-40.17-8.6l-69.18-54.3A46.74,46.74,0,0,1,8.3,199.2L6,109.72A46.72,46.72,0,0,1,22.53,72.93Z"/><path class="cls-2" d="M110.7,22.78a31.26,31.26,0,0,0-12.61,6.46L32.6,84.76a31,31,0,0,0-11,24.56l2.27,89.48a31.09,31.09,0,0,0,11.91,23.72l69.12,54.27a31,31,0,0,0,26.79,5.73L214.12,262a31,31,0,0,0,21-17.62L270.63,164a31,31,0,0,0-.62-26.53L230,57.36a31,31,0,0,0-21.24-16.52l-83.9-18.27a31.25,31.25,0,0,0-14.17.21M106.93,7.66a46.65,46.65,0,0,1,21.26-.32l83.89,18.27A46.76,46.76,0,0,1,244,50.4l40,80.07a46.72,46.72,0,0,1,.93,39.8l-35.56,80.37a46.72,46.72,0,0,1-31.43,26.44l-82.43,20.55a46.79,46.79,0,0,1-40.18-8.58L26.16,234.77A46.76,46.76,0,0,1,8.29,199.2L6,109.72a46.74,46.74,0,0,1,16.5-36.84L88,17.36A46.63,46.63,0,0,1,106.93,7.66Z"/><path class="cls-1" d="M88.09,17.33a46.76,46.76,0,0,1,40.17-10l83.83,18.34A46.72,46.72,0,0,1,244,50.44l40,80.08a46.76,46.76,0,0,1,.93,39.8l-35.55,80.37a46.76,46.76,0,0,1-31.43,26.44l-82.41,20.55a46.74,46.74,0,0,1-40.17-8.6l-69.18-54.3A46.74,46.74,0,0,1,8.3,199.2L6,109.72A46.72,46.72,0,0,1,22.53,72.93Z"/><path class="cls-2" d="M110.7,22.78a31.26,31.26,0,0,0-12.61,6.46L32.6,84.76a31,31,0,0,0-11,24.56l2.27,89.48a31.09,31.09,0,0,0,11.91,23.72l69.12,54.27a31,31,0,0,0,26.79,5.73L214.12,262a31,31,0,0,0,21-17.62L270.63,164a31,31,0,0,0-.62-26.53L230,57.36a31,31,0,0,0-21.24-16.52l-83.9-18.27a31.25,31.25,0,0,0-14.17.21M106.93,7.66a46.65,46.65,0,0,1,21.26-.32l83.89,18.27A46.76,46.76,0,0,1,244,50.4l40,80.07a46.72,46.72,0,0,1,.93,39.8l-35.56,80.37a46.72,46.72,0,0,1-31.43,26.44l-82.43,20.55a46.79,46.79,0,0,1-40.18-8.58L26.16,234.77A46.76,46.76,0,0,1,8.29,199.2L6,109.72a46.74,46.74,0,0,1,16.5-36.84L88,17.36A46.63,46.63,0,0,1,106.93,7.66Z"/><path class="cls-1" d="M88.09,17.33a46.76,46.76,0,0,1,40.17-10l83.83,18.34A46.72,46.72,0,0,1,244,50.44l40,80.08a46.76,46.76,0,0,1,.93,39.8l-35.55,80.37a46.76,46.76,0,0,1-31.43,26.44l-82.41,20.55a46.74,46.74,0,0,1-40.17-8.6l-69.18-54.3A46.74,46.74,0,0,1,8.3,199.2L6,109.72A46.72,46.72,0,0,1,22.53,72.93Z"/><path class="cls-3" d="M110.7,22.78a31.26,31.26,0,0,0-12.61,6.46L32.6,84.76a31,31,0,0,0-11,24.56l2.27,89.48a31.09,31.09,0,0,0,11.91,23.72l69.12,54.27a31,31,0,0,0,26.79,5.73L214.12,262a31,31,0,0,0,21-17.62L270.63,164a31,31,0,0,0-.62-26.53L230,57.36a31,31,0,0,0-21.24-16.52l-83.9-18.27a31.25,31.25,0,0,0-14.17.21M106.93,7.66a46.65,46.65,0,0,1,21.26-.32l83.89,18.27A46.76,46.76,0,0,1,244,50.4l40,80.07a46.72,46.72,0,0,1,.93,39.8l-35.56,80.37a46.72,46.72,0,0,1-31.43,26.44l-82.43,20.55a46.79,46.79,0,0,1-40.18-8.58L26.16,234.77A46.76,46.76,0,0,1,8.29,199.2L6,109.72a46.74,46.74,0,0,1,16.5-36.84L88,17.36A46.63,46.63,0,0,1,106.93,7.66Z"/><path class="cls-4" d="M114.09,90.3q10.62-6.85,26.13-6.85,20.35,0,33.84,9.73T187.53,122q0,11.72-5.84,19.73-3.42,4.88-13.13,12.44l-6.37,4.95a19.41,19.41,0,0,0-6.93,9.46c-.72,2.29-1.1,5.83-1.16,10.64H129.68q.52-15.23,2.87-21t12-13.39l6.56-5.13a22.94,22.94,0,0,0,5.21-5.32,18.19,18.19,0,0,0,3.59-10.9A21,21,0,0,0,156,111q-4-5.64-14.6-5.63-10.44,0-14.79,6.93a26.73,26.73,0,0,0-4.36,14.42h-26Q97.23,101,114.09,90.3ZM129,191.58h27v26H129Z"/></svg>
\ No newline at end of file
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 296 305"><defs><style>.cls-1{fill:none;}.cls-2{fill:#F79009;stroke:#F79009;}.cls-2,.cls-3{stroke-width:1px;}.cls-3,.cls-4{fill:#F79009;}.cls-3{stroke:#F79009;}</style></defs><path class="cls-1" d="M88.09,17.33a46.76,46.76,0,0,1,40.17-10l83.83,18.34A46.72,46.72,0,0,1,244,50.44l40,80.08a46.76,46.76,0,0,1,.93,39.8l-35.55,80.37a46.76,46.76,0,0,1-31.43,26.44l-82.41,20.55a46.74,46.74,0,0,1-40.17-8.6l-69.18-54.3A46.74,46.74,0,0,1,8.3,199.2L6,109.72A46.72,46.72,0,0,1,22.53,72.93Z"/><path class="cls-2" d="M110.7,22.78a31.26,31.26,0,0,0-12.61,6.46L32.6,84.76a31,31,0,0,0-11,24.56l2.27,89.48a31.09,31.09,0,0,0,11.91,23.72l69.12,54.27a31,31,0,0,0,26.79,5.73L214.12,262a31,31,0,0,0,21-17.62L270.63,164a31,31,0,0,0-.62-26.53L230,57.36a31,31,0,0,0-21.24-16.52l-83.9-18.27a31.25,31.25,0,0,0-14.17.21M106.93,7.66a46.65,46.65,0,0,1,21.26-.32l83.89,18.27A46.76,46.76,0,0,1,244,50.4l40,80.07a46.72,46.72,0,0,1,.93,39.8l-35.56,80.37a46.72,46.72,0,0,1-31.43,26.44l-82.43,20.55a46.79,46.79,0,0,1-40.18-8.58L26.16,234.77A46.76,46.76,0,0,1,8.29,199.2L6,109.72a46.74,46.74,0,0,1,16.5-36.84L88,17.36A46.63,46.63,0,0,1,106.93,7.66Z"/><path class="cls-1" d="M88.09,17.33a46.76,46.76,0,0,1,40.17-10l83.83,18.34A46.72,46.72,0,0,1,244,50.44l40,80.08a46.76,46.76,0,0,1,.93,39.8l-35.55,80.37a46.76,46.76,0,0,1-31.43,26.44l-82.41,20.55a46.74,46.74,0,0,1-40.17-8.6l-69.18-54.3A46.74,46.74,0,0,1,8.3,199.2L6,109.72A46.72,46.72,0,0,1,22.53,72.93Z"/><path class="cls-2" d="M110.7,22.78a31.26,31.26,0,0,0-12.61,6.46L32.6,84.76a31,31,0,0,0-11,24.56l2.27,89.48a31.09,31.09,0,0,0,11.91,23.72l69.12,54.27a31,31,0,0,0,26.79,5.73L214.12,262a31,31,0,0,0,21-17.62L270.63,164a31,31,0,0,0-.62-26.53L230,57.36a31,31,0,0,0-21.24-16.52l-83.9-18.27a31.25,31.25,0,0,0-14.17.21M106.93,7.66a46.65,46.65,0,0,1,21.26-.32l83.89,18.27A46.76,46.76,0,0,1,244,50.4l40,80.07a46.72,46.72,0,0,1,.93,39.8l-35.56,80.37a46.72,46.72,0,0,1-31.43,26.44l-82.43,20.55a46.79,46.79,0,0,1-40.18-8.58L26.16,234.77A46.76,46.76,0,0,1,8.29,199.2L6,109.72a46.74,46.74,0,0,1,16.5-36.84L88,17.36A46.63,46.63,0,0,1,106.93,7.66Z"/><path class="cls-1" d="M88.09,17.33a46.76,46.76,0,0,1,40.17-10l83.83,18.34A46.72,46.72,0,0,1,244,50.44l40,80.08a46.76,46.76,0,0,1,.93,39.8l-35.55,80.37a46.76,46.76,0,0,1-31.43,26.44l-82.41,20.55a46.74,46.74,0,0,1-40.17-8.6l-69.18-54.3A46.74,46.74,0,0,1,8.3,199.2L6,109.72A46.72,46.72,0,0,1,22.53,72.93Z"/><path class="cls-3" d="M110.7,22.78a31.26,31.26,0,0,0-12.61,6.46L32.6,84.76a31,31,0,0,0-11,24.56l2.27,89.48a31.09,31.09,0,0,0,11.91,23.72l69.12,54.27a31,31,0,0,0,26.79,5.73L214.12,262a31,31,0,0,0,21-17.62L270.63,164a31,31,0,0,0-.62-26.53L230,57.36a31,31,0,0,0-21.24-16.52l-83.9-18.27a31.25,31.25,0,0,0-14.17.21M106.93,7.66a46.65,46.65,0,0,1,21.26-.32l83.89,18.27A46.76,46.76,0,0,1,244,50.4l40,80.07a46.72,46.72,0,0,1,.93,39.8l-35.56,80.37a46.72,46.72,0,0,1-31.43,26.44l-82.43,20.55a46.79,46.79,0,0,1-40.18-8.58L26.16,234.77A46.76,46.76,0,0,1,8.29,199.2L6,109.72a46.74,46.74,0,0,1,16.5-36.84L88,17.36A46.63,46.63,0,0,1,106.93,7.66Z"/><path class="cls-4" d="M114.09,90.3q10.62-6.85,26.13-6.85,20.35,0,33.84,9.73T187.53,122q0,11.72-5.84,19.73-3.42,4.88-13.13,12.44l-6.37,4.95a19.41,19.41,0,0,0-6.93,9.46c-.72,2.29-1.1,5.83-1.16,10.64H129.68q.52-15.23,2.87-21t12-13.39l6.56-5.13a22.94,22.94,0,0,0,5.21-5.32,18.19,18.19,0,0,0,3.59-10.9A21,21,0,0,0,156,111q-4-5.64-14.6-5.63-10.44,0-14.79,6.93a26.73,26.73,0,0,0-4.36,14.42h-26Q97.23,101,114.09,90.3ZM129,191.58h27v26H129Z"/></svg>
\ No newline at end of file
diff --git a/akvo/rsr/spa/app/images/status-revision.svg b/akvo/rsr/spa/app/images/status-revision.svg
index d632410c84..1af19ed2f3 100644
--- a/akvo/rsr/spa/app/images/status-revision.svg
+++ b/akvo/rsr/spa/app/images/status-revision.svg
@@ -1 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21.28 22"><defs><style>.cls-1{fill:none;}.cls-2{fill:#e36f3c;}</style></defs><g id="Group_1227" data-name="Group 1227"><g id="Group_1226" data-name="Group 1226"><g id="Component_22_23" data-name="Component 22 23"><g id="Polygon_11" data-name="Polygon 11"><path class="cls-1" d="M6,1A4,4,0,0,1,9.44.09l5.87,1.28A4,4,0,0,1,18,3.49l2.82,5.64a4,4,0,0,1,.08,3.4l-2.5,5.65a4,4,0,0,1-2.69,2.26L10,21.88a4,4,0,0,1-3.44-.74L1.69,17.33a4,4,0,0,1-1.53-3L0,8A4,4,0,0,1,1.41,4.84Z"/><path class="cls-2" d="M8,1.57a2.7,2.7,0,0,0-1,.52L2.38,6A2.48,2.48,0,0,0,1.5,8l.16,6.3a2.48,2.48,0,0,0,1,1.9L7.47,20a2.48,2.48,0,0,0,2.15.46L15.39,19a2.52,2.52,0,0,0,1.68-1.42l2.5-5.64a2.52,2.52,0,0,0-.05-2.13L16.7,4.16A2.48,2.48,0,0,0,15,2.84L9.12,1.56A2.58,2.58,0,0,0,8,1.57M7.62.12a4,4,0,0,1,1.82,0l5.87,1.28A4,4,0,0,1,18,3.49l2.82,5.64a4,4,0,0,1,.08,3.4l-2.5,5.65a4,4,0,0,1-2.69,2.26L10,21.88a4,4,0,0,1-3.43-.74L1.69,17.33a4,4,0,0,1-1.53-3L0,8A4,4,0,0,1,1.41,4.84L6,1A4.1,4.1,0,0,1,7.62.12Z"/></g></g><g id="ic_golf_course_24px" data-name="ic golf course 24px"><path id="Path_105" data-name="Path 105" class="cls-2" d="M14.46,7.79l-6.7-2.6,0,11.38c0,1.08-.12,1,.47,1s.49,0,.49-.5V9.52Z"/></g></g></g></svg>
\ No newline at end of file
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21.28 22"><defs><style>.cls-1{fill:none;}.cls-2{fill:#D92D20;}</style></defs><g id="Group_1227" data-name="Group 1227"><g id="Group_1226" data-name="Group 1226"><g id="Component_22_23" data-name="Component 22 23"><g id="Polygon_11" data-name="Polygon 11"><path class="cls-1" d="M6,1A4,4,0,0,1,9.44.09l5.87,1.28A4,4,0,0,1,18,3.49l2.82,5.64a4,4,0,0,1,.08,3.4l-2.5,5.65a4,4,0,0,1-2.69,2.26L10,21.88a4,4,0,0,1-3.44-.74L1.69,17.33a4,4,0,0,1-1.53-3L0,8A4,4,0,0,1,1.41,4.84Z"/><path class="cls-2" d="M8,1.57a2.7,2.7,0,0,0-1,.52L2.38,6A2.48,2.48,0,0,0,1.5,8l.16,6.3a2.48,2.48,0,0,0,1,1.9L7.47,20a2.48,2.48,0,0,0,2.15.46L15.39,19a2.52,2.52,0,0,0,1.68-1.42l2.5-5.64a2.52,2.52,0,0,0-.05-2.13L16.7,4.16A2.48,2.48,0,0,0,15,2.84L9.12,1.56A2.58,2.58,0,0,0,8,1.57M7.62.12a4,4,0,0,1,1.82,0l5.87,1.28A4,4,0,0,1,18,3.49l2.82,5.64a4,4,0,0,1,.08,3.4l-2.5,5.65a4,4,0,0,1-2.69,2.26L10,21.88a4,4,0,0,1-3.43-.74L1.69,17.33a4,4,0,0,1-1.53-3L0,8A4,4,0,0,1,1.41,4.84L6,1A4.1,4.1,0,0,1,7.62.12Z"/></g></g><g id="ic_golf_course_24px" data-name="ic golf course 24px"><path id="Path_105" data-name="Path 105" class="cls-2" d="M14.46,7.79l-6.7-2.6,0,11.38c0,1.08-.12,1,.47,1s.49,0,.49-.5V9.52Z"/></g></g></g></svg>
\ No newline at end of file
diff --git a/akvo/rsr/spa/app/modules/results-admin/components/DisaggregationsInput.jsx b/akvo/rsr/spa/app/modules/results-admin/components/DisaggregationsInput.jsx
index df887502f0..4b8ff894f0 100644
--- a/akvo/rsr/spa/app/modules/results-admin/components/DisaggregationsInput.jsx
+++ b/akvo/rsr/spa/app/modules/results-admin/components/DisaggregationsInput.jsx
@@ -32,7 +32,7 @@ const DisaggregationsInput = ({
             />
           ) : (
             <div>
-              <div style={{ paddingLeft: '1em' }}>{dsg.value}</div>
+              <h6>{dsg.value}</h6>
               <FinalField
                 name={`disaggregations[${disaggregations.findIndex(it => it.typeId === dsg.id && group.id === it.groupId)}].numerator`}
                 control="input-number"
diff --git a/akvo/rsr/spa/app/modules/results-admin/components/ReportedEdit.scss b/akvo/rsr/spa/app/modules/results-admin/components/ReportedEdit.scss
index 5feffae3e5..c87b5da192 100644
--- a/akvo/rsr/spa/app/modules/results-admin/components/ReportedEdit.scss
+++ b/akvo/rsr/spa/app/modules/results-admin/components/ReportedEdit.scss
@@ -100,4 +100,40 @@
       white-space: nowrap;
     }
   }
+  .table-history-sm {
+    display: none;
+    text-align: right;
+    .ant-btn-link {
+      color: rgba(0, 0, 0, 0.85);
+    }
+  }
+  .table-history-md {
+    display: block;
+  }
+}
+
+/*
+* Device = Low Resolution Tablets, Mobiles (Landscape)
+* Screen = B/w 481px to 767px
+*/
+@media (min-width: 481px) and (max-width: 767px) {
+  #rsr-form-container .table-history-sm {
+    display: block;
+  }
+  #rsr-form-container .table-history-md {
+    display: none;
+  }
 }
+
+/**
+* Device = Most of the Smartphones Mobiles (Portrait)
+* Screen = B/w 320px to 479px
+*/
+@media (min-width: 280px) and (max-width: 480px) {
+  #rsr-form-container .table-history-sm {
+    display: block;
+  }
+  #rsr-form-container .table-history-md {
+    display: none;
+  }
+}
\ No newline at end of file
diff --git a/akvo/rsr/spa/app/modules/results/enumerator.jsx b/akvo/rsr/spa/app/modules/results/enumerator.jsx
index 552d13b6ac..609ce5b222 100644
--- a/akvo/rsr/spa/app/modules/results/enumerator.jsx
+++ b/akvo/rsr/spa/app/modules/results/enumerator.jsx
@@ -591,7 +591,7 @@ const AddUpdate = ({ period, indicator, addUpdateToPeriod, patchUpdateInPeriod,
                                 precision={2}
                                 verticalGuides={1}
                                 {...period}
-                              />
+                            />
                             )
                           }}
                         </FormSpy>
@@ -732,7 +732,7 @@ const PrevUpdate = ({ update, period, indicator }) => {
           <Button type="link" onClick={() => setShowSubmissionsModal(true)}>See all submissions</Button>
         </div>
       }
-      <AllSubmissionsModal period={period} visible={showSubmissionsModal} onCancel={() => setShowSubmissionsModal(false)} />
+      <AllSubmissionsModal {...period} visible={showSubmissionsModal} onCancel={() => setShowSubmissionsModal(false)} />
     </div>
   )
 }
diff --git a/akvo/rsr/spa/app/modules/results/enumerator.scss b/akvo/rsr/spa/app/modules/results/enumerator.scss
index 9dc119f9fd..e0f042bb21 100644
--- a/akvo/rsr/spa/app/modules/results/enumerator.scss
+++ b/akvo/rsr/spa/app/modules/results/enumerator.scss
@@ -382,7 +382,7 @@
             color: #009B8F;
           }
           &.pending{
-            color: #e36f3c;
+            color: #F79009;
           }
           &.returned{
             color: #961417;
@@ -537,12 +537,36 @@
 .all-submissions-modal{
   .ant-modal-body {
     overflow-x: auto;
+    padding: 1rem;
   }
-  .ant-modal-body>table{
+  .ant-modal-body>div{
     width: 100%;
-    &>tr{
+    &>.ant-row-flex{
+      .ant-col {
+        line-height: 1.5rem;
+        &.dsg-tags .ant-tag {
+          width: 100%;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          padding: 8px;
+          margin: 8px 0;
+        }
+        &.dsg-tags .ant-tag .badge.D .ant-badge-count,
+        &.dsg-tags .ant-tag .badge.P .ant-badge-count {
+          background-color: #F79009;
+        }
+        &.dsg-tags .ant-tag .badge.R .ant-badge-count {
+          background-color: #D92D20;
+
+        }
+        &.dsg-tags .ant-tag .badge.A .ant-badge-count {
+          background-color: #42998e;
+        }
+      }
       &:not(:last-child){
         border-bottom: 1px solid #d8d8d8;
+        padding: .5rem 0 2.5rem;
       }
       svg{
         width: 24px;
@@ -561,9 +585,6 @@
         margin-left: 10px;
         font-size: 13px;
         white-space: nowrap;
-      }
-      td{
-
       }
       td.spacer{
         width: 100%;
@@ -588,13 +609,15 @@
           margin-left: 10px;
           color: rgb(49, 49, 49);
         }
-        .h-holder{
-          position: absolute;
-          top: -10px;
-          display: flex;
+        .h-holder {
+          margin: 8px 0;
         }
         ul{
+          border: 1px solid #b6b6b6;
+          padding: 8px;
+          border-radius: 4px;
           display: flex;
+          overflow-x: scroll;
           li{
             margin-left: 15px;
             white-space: nowrap;
@@ -615,8 +638,13 @@
         color: #42998e;
         font-weight: 600;
         font-size: 30px;
-        text-align: right;
         margin-right: 24px;
+        &.D, &.P {
+          color: #F79009;
+        }
+        &.R {
+          color: #D92D20;
+        }
       }
     }
   }