diff --git a/src/components/GCU/gcuContent.scss b/src/components/GCU/gcuContent.scss
index 1e8ef689fa4857a4dadeaf3ff85e7669d857b023..2e397e5dc43ca0c848b23518db1db080526351c4 100644
--- a/src/components/GCU/gcuContent.scss
+++ b/src/components/GCU/gcuContent.scss
@@ -10,12 +10,10 @@
   text-align: left;
   padding: 0 2rem;
   .gcu-content-wrapper {
-    width: 36rem;
+    max-width: 36rem;
     margin: 2rem 0;
     color: $grey-bright;
-    @media #{$large-phone} {
-      width: 100%;
-    }
+    width: 100%;
     .version {
       color: $soft-grey;
       text-align: center;
diff --git a/src/components/LegalNotice/legalNoticeLink.scss b/src/components/LegalNotice/legalNoticeLink.scss
index 6998b06d085d3cafeee08915a25c4b6fb6ea6b3c..402a22fc23d7dd52321ea2a21ae2de308b2350a2 100644
--- a/src/components/LegalNotice/legalNoticeLink.scss
+++ b/src/components/LegalNotice/legalNoticeLink.scss
@@ -15,7 +15,7 @@
   }
   .legal-notice-content {
     max-width: 45.75rem;
-
+    width: 100%;
     @media #{$large-phone} {
       width: 100%;
     }
diff --git a/src/components/Routes/Routes.tsx b/src/components/Routes/Routes.tsx
index 70f4af9798abf4e20a0d65f5401198e71de33b97..57a7c92b3fc30f46a5c5cb6f0ffb076e388ae6ca 100644
--- a/src/components/Routes/Routes.tsx
+++ b/src/components/Routes/Routes.tsx
@@ -7,6 +7,7 @@ import QuizView from 'components/Quiz/QuizView'
 import ExplorationView from 'components/Exploration/ExplorationView'
 import ActionView from 'components/Action/ActionView'
 import UnSubscribe from 'components/Options/UnSubscribe'
+import TermsView from 'components/Terms/TermsView'
 
 const HomeView = lazy(() => import('components/Home/HomeView'))
 const SingleFluidView = lazy(() =>
@@ -26,7 +27,7 @@ const AnalysisView = lazy(() => import('components/Analysis/AnalysisView'))
 const ProfileTypeView = lazy(() =>
   import('components/ProfileType/ProfileTypeView')
 )
-const TermsView = lazy(() => import('components/Terms/TermsView'))
+// const TermsView = lazy(() => import('components/Terms/TermsView'))
 
 interface RouteProps {
   isLastTermAccepted: boolean
@@ -35,12 +36,15 @@ const Routes: React.FC<RouteProps> = ({ isLastTermAccepted }: RouteProps) => {
   return (
     <Suspense fallback={<div></div>}>
       <Switch>
+        {isLastTermAccepted && <Redirect from="/terms" to="/consumption" />}
+        <Route path="/terms" component={TermsView} />
         {!isLastTermAccepted && (
           <>
-            <Route path="/terms" component={TermsView} />
             <Redirect from="*" to="/terms" />
+            <Redirect from="/" to="/terms" />
           </>
         )}
+
         <Route
           path="/consumption"
           render={({ match: { url } }) => (