diff --git a/circle.yml b/circle.yml
index 64adb14a..d9cb5523 100644
--- a/circle.yml
+++ b/circle.yml
@@ -7,6 +7,7 @@ jobs:
        - checkout
        - run: npm i
        - run: npx proton-pack
+       - run: npm run check-types
        - run: npm run lint
        - run: npm run i18n:validate
        - run: npm run i18n:validate:context
diff --git a/src/app/PublicApp.js b/src/app/PublicApp.js
index eaa3c50f..0e4a5b2d 100644
--- a/src/app/PublicApp.js
+++ b/src/app/PublicApp.js
@@ -1,12 +1,18 @@
 import React, { useState, useRef, useLayoutEffect } from 'react';
 import PropTypes from 'prop-types';
 import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';
-import { Loader, ModalsChildren, ResetPasswordContainer, ForgotUsernameContainer } from 'react-components';
+import {
+    Loader,
+    ModalsChildren,
+    ResetPasswordContainer,
+    ForgotUsernameContainer,
+    SignupContainer
+} from 'react-components';
 import { loadOpenPGP } from 'proton-shared/lib/openpgp';
+import PlansTable from 'react-components/containers/payments/PlansTable';
 
 import PublicLayout from './components/layout/PublicLayout';
 import LoginContainer from './containers/LoginContainer';
-import SignupContainer from './containers/SignupContainer';
 
 const PublicApp = ({ onLogin }) => {
     const hasStopRedirect = useRef(false);
@@ -53,10 +59,13 @@ const PublicApp = ({ onLogin }) => {
                             path="/signup/:step?"
                             render={({ history, match }) => (
                                 <SignupContainer
+                                    redirectUrl="/"
+                                    homepageUrl={'https://protonmail.com'}
                                     stopRedirect={stopRedirect}
                                     history={history}
                                     match={match}
                                     onLogin={onLogin}
+                                    renderPlansTable={(props) => <PlansTable {...props} />}
                                 />
                             )}
                         />
diff --git a/src/app/app.scss b/src/app/app.scss
index e545a134..b9cfa131 100644
--- a/src/app/app.scss
+++ b/src/app/app.scss
@@ -1 +1,4 @@
 @import '~react-components/styles/index';
+
+// TODO: this should not be specific to protonvpn anymore
+@import '~design-system/_sass/pv-styles/pv-plan-card';
diff --git a/src/app/config.ts b/src/app/config.ts
index a8ccc852..cb7d871a 100644
--- a/src/app/config.ts
+++ b/src/app/config.ts
@@ -4,9 +4,9 @@ export const CLIENT_SECRET = '';
 export const APP_VERSION = '1.0.0';
 export const APP_NAME = 'proton-mail';
 export const API_URL = 'https://mail.protonmail.com/api';
-export const SECURE_URL = 'undefined';
+export const SECURE_URL = 'https://secure.protonmail.blue';
 export const API_VERSION = '3';
-export const DATE_VERSION = 'Sat, 12 Oct 2019 06:56:36 GMT';
+export const DATE_VERSION = 'Wed, 16 Oct 2019 12:43:25 GMT';
 export const CHANGELOG_PATH = 'assets/changelog.tpl.html';
 export const VERSION_PATH = 'assets/version.json';
 export const SENTRY_RELEASE = '';
diff --git a/src/app/containers/SignupContainer.js b/src/app/containers/SignupContainer.js
deleted file mode 100644
index d4068754..00000000
--- a/src/app/containers/SignupContainer.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-// eslint-disable-next-line
-const SignupContainer = ({ match, history, onLogin, stopRedirect }) => {
-    return <>SignupContainer</>;
-};
-
-SignupContainer.propTypes = {
-    stopRedirect: PropTypes.func.isRequired,
-    onLogin: PropTypes.func.isRequired,
-    match: PropTypes.shape({
-        params: PropTypes.shape({
-            step: PropTypes.string
-        })
-    }).isRequired,
-    history: PropTypes.shape({
-        push: PropTypes.func.isRequired,
-        location: PropTypes.shape({
-            search: PropTypes.string.isRequired,
-            state: PropTypes.oneOfType([
-                PropTypes.shape({
-                    selector: PropTypes.string.isRequired,
-                    token: PropTypes.string.isRequired
-                }),
-                PropTypes.shape({
-                    Coupon: PropTypes.shape({ Code: PropTypes.string })
-                })
-            ])
-        }).isRequired
-    }).isRequired
-};
-
-export default SignupContainer;