diff --git a/app/src/components/BalanceToken.js b/app/src/components/BalanceToken.js
index 8515ed5..a6a3548 100644
--- a/app/src/components/BalanceToken.js
+++ b/app/src/components/BalanceToken.js
@@ -17,9 +17,11 @@ const BalanceToken = ({ amount, symbol, verified, convertedAmount = -1 }) => (
   <Wrap>
     <div>
       <Text color={useTheme().surfaceContent.toString()}>
-        {splitAmount(amount.toFixed(3))}{' '}
+        {amount ? splitAmount(amount.toFixed(3)) : ' - '}{' '}
+      </Text>
+      <Text color={useTheme().surfaceContent.toString()}>
+        {symbol || ' ? '}
       </Text>
-      <Text color={useTheme().surfaceContent.toString()}>{symbol || '?'}</Text>
     </div>
     <ConvertedAmount>
       {convertedAmount >= 0
diff --git a/app/src/components/ConvictionVisuals.js b/app/src/components/ConvictionVisuals.js
index e5efca1..0692b7b 100644
--- a/app/src/components/ConvictionVisuals.js
+++ b/app/src/components/ConvictionVisuals.js
@@ -16,6 +16,7 @@ import {
   getConvictionTrend,
 } from '../lib/conviction'
 import { useBlockNumber } from '../BlockContext'
+import { fromDecimals } from '../lib/math-utils'
 
 function getStakesAndThreshold(proposal = {}) {
   const { appState } = useAragonApi()
@@ -37,7 +38,7 @@ function getStakesAndThreshold(proposal = {}) {
   return { stakes, totalTokensStaked, threshold, max }
 }
 
-export function ConvictionChart({ proposal }) {
+export function ConvictionChart({ proposal, width = '50%' }) {
   const { stakes, threshold } = getStakesAndThreshold(proposal)
   const currentBlock = useBlockNumber()
   const { connectedAccount } = useAragonApi()
@@ -64,6 +65,7 @@ export function ConvictionChart({ proposal }) {
 
   return (
     <LineChart
+      width={width}
       lines={normalize(lines, threshold)}
       total={lines[0] && lines[0].length}
       label={i => i - Math.floor((lines[0].length - 1) / 2)}
@@ -116,7 +118,13 @@ export function ConvictionBar({ proposal }) {
           {Math.round(stakedConviction * 100)}%
         </Text>{' '}
         <Text color={theme.surfaceContentSecondary.toString()}>
-          ({Math.round(neededConviction * 100)}% conviction needed)
+          (
+          {isFinite(neededConviction) ? (
+            `${Math.round(neededConviction * 100)}% `
+          ) : (
+            <React.Fragment>&infin; </React.Fragment>
+          )}
+          conviction needed)
         </Text>
       </div>
     </div>
@@ -147,14 +155,15 @@ export function ConvictionButton({ proposal, onStake, onWithdraw, onExecute }) {
 }
 
 export function ConvictionCountdown({ proposal }) {
-  const { alpha } = getGlobalParams()
+  const { alpha, maxRatio } = getGlobalParams()
   const {
     appState: {
-      stakeToken: { tokenSymbol },
+      stakeToken: { tokenSymbol, tokenDecimals },
     },
   } = useAragonApi()
   const blockNumber = useBlockNumber()
   const theme = useTheme()
+  const { executed } = proposal
   const { stakes, totalTokensStaked, threshold } = getStakesAndThreshold(
     proposal
   )
@@ -171,8 +180,16 @@ export function ConvictionCountdown({ proposal }) {
   const UNABLE_TO_PASS = 0
   const MAY_PASS = 1
   const AVAILABLE = 2
+  const EXECUTED = 3
+
   const getView = () =>
-    conviction >= threshold ? AVAILABLE : time > 0 ? MAY_PASS : UNABLE_TO_PASS
+    executed
+      ? EXECUTED
+      : conviction >= threshold
+      ? AVAILABLE
+      : time > 0
+      ? MAY_PASS
+      : UNABLE_TO_PASS
   const [view, setView] = useState(getView())
 
   const NOW = Date.now()
@@ -189,15 +206,31 @@ export function ConvictionCountdown({ proposal }) {
       <Text color={theme.negative.toString()}> ✘ Won't pass</Text>
       <div>
         <Text color={theme.surfaceContent.toString()}>
-          Insufficient staked tokens
+          {!isNaN(neededTokens)
+            ? 'Insufficient staked tokens'
+            : 'Not enough funds in the organization'}
         </Text>
         <br />
         <Text color={theme.surfaceContentSecondary.toString()}>
-          (At least{' '}
-          <Tag>
-            {neededTokens} {tokenSymbol}
-          </Tag>{' '}
-          more needed).
+          (
+          {!isNaN(neededTokens) ? (
+            <React.Fragment>
+              At least{' '}
+              <Tag>
+                {parseFloat(
+                  fromDecimals(neededTokens.toString(), tokenDecimals)
+                )
+                  .toFixed(2)
+                  .toString()}{' '}
+                {tokenSymbol}
+              </Tag>{' '}
+              more needed
+            </React.Fragment>
+          ) : (
+            `Funding requests must be below ${maxRatio *
+              100}% organization total funds`
+          )}
+          ).
         </Text>
       </div>
     </>
@@ -210,6 +243,8 @@ export function ConvictionCountdown({ proposal }) {
       </Text>
       {!!endDate && <Timer end={endDate} />}
     </>
+  ) : view === EXECUTED ? (
+    <Text color={theme.positive.toString()}> ✓ Executed</Text>
   ) : (
     <>
       <Text color={theme.positive.toString()}> ✓ Available for execution</Text>
diff --git a/app/src/components/ModifiedLineChart.js b/app/src/components/ModifiedLineChart.js
index d788bb2..e05becc 100644
--- a/app/src/components/ModifiedLineChart.js
+++ b/app/src/components/ModifiedLineChart.js
@@ -1,11 +1,38 @@
-import React, { useMemo, useCallback } from 'react'
+import React, { useMemo, useCallback, useEffect, useRef, useState } from 'react'
 import { Spring } from 'react-spring'
 import { unselectable, springs } from '@aragon/ui'
 
 const LABELS_HEIGHT = 30
+const WIDTH_DEFAULT = 300
+
+function useMeasuredWidth() {
+  const ref = useRef()
+  const [measuredWidth, setMeasuredWidth] = useState(WIDTH_DEFAULT)
+
+  const onResize = useCallback(() => {
+    if (ref.current) {
+      setMeasuredWidth(ref.current.clientWidth)
+    }
+  }, [])
+
+  const onRef = useCallback(
+    element => {
+      ref.current = element
+      onResize()
+    },
+    [onResize]
+  )
+
+  useEffect(() => {
+    window.addEventListener('resize', onResize)
+    return () => window.removeEventListener('resize', onResize)
+  }, [onResize])
+
+  return [measuredWidth, onRef]
+}
 
 const ModifiedLineChart = ({
-  width,
+  width: widthProps,
   height,
   borderColor,
   dotRadius,
@@ -20,6 +47,8 @@ const ModifiedLineChart = ({
   total,
   ...props
 }) => {
+  const [width, onSvgRef] = useMeasuredWidth()
+
   // the total amount of values
   const lines = useMemo(() => {
     return linesProps.map(lineOrValues =>
@@ -90,8 +119,8 @@ const ModifiedLineChart = ({
       {({ progress }) => (
         <svg
           viewBox={`0 0 ${width} ${height}`}
-          width={width}
-          height={height}
+          width={widthProps || 'auto'}
+          height="auto"
           css="display: block"
           {...props}
         >
diff --git a/app/src/screens/ProposalDetail.js b/app/src/screens/ProposalDetail.js
index 445764c..77b3e05 100644
--- a/app/src/screens/ProposalDetail.js
+++ b/app/src/screens/ProposalDetail.js
@@ -9,6 +9,7 @@ import {
   useLayout,
   useTheme,
   Link,
+  Split,
 } from '@aragon/ui'
 import styled from 'styled-components'
 import { useAragonApi } from '@aragon/api-react'
@@ -22,7 +23,7 @@ import {
 } from '../components/ConvictionVisuals'
 import { addressesEqualNoSum as addressesEqual } from '../lib/web3-utils'
 
-const Wrapper = styled.div`
+/* const Wrapper = styled.div`
   display: grid;
   grid-template-columns: auto;
   grid-column-gap: ${2.5 * GU}px;
@@ -31,7 +32,8 @@ const Wrapper = styled.div`
   }
   min-height: 100vh;
   width: 100%;
-`
+` */
+
 const H2 = styled.h2`
   ${textStyle('label2')};
   color: ${props => props.color};
@@ -41,120 +43,158 @@ const H2 = styled.h2`
 const Progress = styled.div`
   width: 100%;
 `
-
+const Chart = styled.div`
+  width: 100%;
+`
 function ProposalDetail({ proposal, onBack, requestToken }) {
   const theme = useTheme()
   const { layoutName } = useLayout()
   const { api, connectedAccount } = useAragonApi()
 
-  const { id, name, creator, beneficiary, link, requestedAmount } = proposal
-
+  const {
+    id,
+    name,
+    creator,
+    beneficiary,
+    link,
+    requestedAmount,
+    executed,
+  } = proposal
   return (
-    <Wrapper>
-      <div>
-        <Bar>
-          <BackButton onClick={onBack} />
-        </Bar>
-        <Box>
-          <section
-            css={`
-              display: grid;
-              grid-template-rows: auto;
-              grid-gap: ${2.5 * GU}px;
-              margin-top: ${2.5 * GU}px;
-            `}
-          >
-            <h1
-              css={`
-                ${textStyle('title2')};
-                font-weight: 600;
-              `}
-            >
-              #{id} {name}
-            </h1>
-            <div
-              css={`
-                display: grid;
-                grid-template-columns: ${layoutName !== 'small'
-                  ? 'auto auto auto auto'
-                  : 'auto'};
-                grid-gap: ${layoutName !== 'small' ? 5 * GU : 2.5 * GU}px;
-              `}
-            >
-              <Amount
-                requestedAmount={requestedAmount}
-                requestToken={requestToken}
-              />
-              <div>
-                <H2 color={theme.surfaceContentSecondary}>Links</H2>
-                {link ? (
-                  <Link href={link} external>
-                    Read more
-                  </Link>
-                ) : (
-                  <Text
-                    css={`
-                      ${textStyle('body2')};
-                    `}
-                  >
-                    No link provided.
-                  </Text>
-                )}
-              </div>
-              <div>
-                <H2 color={theme.surfaceContentSecondary}>Created By</H2>
-                <div
+    <div>
+      <Bar>
+        <BackButton onClick={onBack} />
+      </Bar>
+      <Split
+        primary={
+          <div>
+            <Box>
+              <section
+                css={`
+                  display: grid;
+                  grid-template-rows: auto;
+                  grid-gap: ${2.5 * GU}px;
+                  margin-top: ${2.5 * GU}px;
+                `}
+              >
+                <h1
                   css={`
-                    display: flex;
-                    align-items: flex-start;
+                    ${textStyle('title2')};
+                    font-weight: 600;
                   `}
                 >
-                  <LocalIdentityBadge
-                    connectedAccount={addressesEqual(creator, connectedAccount)}
-                    entity={creator}
-                  />
-                </div>
-              </div>
-              <div>
-                <H2 color={theme.surfaceContentSecondary}>Recipient</H2>
+                  #{id} {name}
+                </h1>
                 <div
                   css={`
-                    display: flex;
-                    align-items: flex-start;
+                    display: grid;
+                    grid-template-columns: ${layoutName !== 'small'
+                      ? 'auto auto auto auto'
+                      : 'auto'};
+                    grid-gap: ${layoutName !== 'small' ? 5 * GU : 2.5 * GU}px;
                   `}
                 >
-                  <LocalIdentityBadge
-                    connectedAccount={addressesEqual(
-                      beneficiary,
-                      connectedAccount
-                    )}
-                    entity={beneficiary}
+                  <Amount
+                    requestedAmount={requestedAmount}
+                    requestToken={requestToken}
                   />
+                  <div>
+                    <H2 color={theme.surfaceContentSecondary}>Links</H2>
+                    {link ? (
+                      <Link href={link} external>
+                        Read more
+                      </Link>
+                    ) : (
+                      <Text
+                        css={`
+                          ${textStyle('body2')};
+                        `}
+                      >
+                        No link provided.
+                      </Text>
+                    )}
+                  </div>
+                  <div>
+                    <H2 color={theme.surfaceContentSecondary}>Created By</H2>
+                    <div
+                      css={`
+                        display: flex;
+                        align-items: flex-start;
+                      `}
+                    >
+                      <LocalIdentityBadge
+                        connectedAccount={addressesEqual(
+                          creator,
+                          connectedAccount
+                        )}
+                        entity={creator}
+                      />
+                    </div>
+                  </div>
+                  <div>
+                    <H2 color={theme.surfaceContentSecondary}>Recipient</H2>
+                    <div
+                      css={`
+                        display: flex;
+                        align-items: flex-start;
+                      `}
+                    >
+                      <LocalIdentityBadge
+                        connectedAccount={addressesEqual(
+                          beneficiary,
+                          connectedAccount
+                        )}
+                        entity={beneficiary}
+                      />
+                    </div>
+                  </div>
                 </div>
-              </div>
-            </div>
-            <Progress>
-              <H2 color={theme.surfaceContentSecondary}>Conviction Progress</H2>
-              <ConvictionBar proposal={proposal} />
-            </Progress>
-            <ConvictionButton
-              proposal={proposal}
-              onStake={() => api.stakeAllToProposal(id).toPromise()}
-              onWithdraw={() => api.withdrawAllFromProposal(id).toPromise()}
-              onExecute={() => api.executeProposal(id, true).toPromise()}
-            />
-          </section>
-        </Box>
-      </div>
-      <div>
-        <Box heading="Status">
-          <ConvictionCountdown proposal={proposal} />
-        </Box>
-        <Box heading="Conviction prediction">
-          <ConvictionChart proposal={proposal} />
-        </Box>
-      </div>
-    </Wrapper>
+                {!executed && (
+                  <React.Fragment>
+                    <Progress>
+                      <H2 color={theme.surfaceContentSecondary}>
+                        Conviction Progress
+                      </H2>
+                      <ConvictionBar proposal={proposal} />
+                    </Progress>
+                    <Chart>
+                      <H2 color={theme.surfaceContentSecondary}>
+                        Conviction prediction
+                      </H2>
+                      <div
+                        css={`
+                          display: flex;
+                          justify-content: center;
+                        `}
+                      >
+                        <ConvictionChart proposal={proposal} />
+                      </div>
+                    </Chart>
+                    <ConvictionButton
+                      proposal={proposal}
+                      onStake={() => api.stakeAllToProposal(id).toPromise()}
+                      onWithdraw={() =>
+                        api.withdrawAllFromProposal(id).toPromise()
+                      }
+                      onExecute={() =>
+                        api.executeProposal(id, true).toPromise()
+                      }
+                    />
+                  </React.Fragment>
+                )}
+              </section>
+            </Box>
+          </div>
+        }
+        secondary={
+          <div>
+            <Box heading="Status">
+              <ConvictionCountdown proposal={proposal} />
+            </Box>
+          </div>
+        }
+      />
+    </div>
   )
 }
 
diff --git a/app/src/screens/Proposals.js b/app/src/screens/Proposals.js
index ecbe4ae..0c13723 100644
--- a/app/src/screens/Proposals.js
+++ b/app/src/screens/Proposals.js
@@ -72,7 +72,7 @@ const Proposals = React.memo(function Proposals({
           }
           entries={filteredProposals}
           renderEntry={proposal => {
-            return [
+            const entriesElements = [
               <IdAndTitle
                 id={proposal.id}
                 name={proposal.name}
@@ -82,15 +82,19 @@ const Proposals = React.memo(function Proposals({
                 requestedAmount={proposal.requestedAmount}
                 requestToken={requestToken}
               />,
-              <div
-                css={`
-                  width: ${23 * GU};
-                `}
-              >
-                <ConvictionBar proposal={proposal} />
-              </div>,
-              <ConvictionTrend proposal={proposal} />,
             ]
+            if (!proposal.executed)
+              entriesElements.push(
+                <div
+                  css={`
+                    width: ${23 * GU};
+                  `}
+                >
+                  <ConvictionBar proposal={proposal} />
+                </div>,
+                <ConvictionTrend proposal={proposal} />
+              )
+            return entriesElements
           }}
           tableRowHeight={14 * GU}
           heading={
diff --git a/package.json b/package.json
index fdece8c..a1512e9 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "@aragon/os": "^4.3.0"
   },
   "devDependencies": {
-    "@aragon/cli": "^7.0.3",
+    "@aragon/cli": "7.0.3",
     "@aragon/templates-shared": "^1.0.1",
     "@aragon/test-helpers": "^2.0.0",
     "@aragon/truffle-config-v5": "^1.0.0",