diff --git a/client/html/index.html b/client/html/index.html
index 0cfbbba3e..b81b86c87 100644
--- a/client/html/index.html
+++ b/client/html/index.html
@@ -13,8 +13,8 @@
   <link rel="shortcut icon" type="image/png/ico" href="/favicon.ico" />
   <script src="https://unpkg.com/apollo-client-browser@1.7.0"></script>
 
-  <script type="text/javascript" src="https://develop.advancedalgos.net/Scripts/Require.js"></script>
-  <script type="text/javascript" src="https://develop.advancedalgos.net/Scripts/AppPreLoader.js"></script>
+  <script type="text/javascript" src="https://charts-dev.advancedalgos.net/Scripts/Require.js"></script>
+  <script type="text/javascript" src="https://charts-dev.advancedalgos.net/Scripts/AppPreLoader.js"></script>
 
   <script type="text/javascript">
     function loadCanvas(){
diff --git a/client/src/views/callback/index.js b/client/src/views/callback/index.js
index 01ae059fa..9f052889f 100644
--- a/client/src/views/callback/index.js
+++ b/client/src/views/callback/index.js
@@ -6,7 +6,7 @@ const Callback = () => <BannerTopBar
   size='big'
   title=''
   text='Authenticating...'
-  backgroundUrl='https://aacorporatesitedevelop.azurewebsites.net/img/photos/superalgos-platform.jpg'
+  backgroundUrl='https://advancedalgos.net/img/photos/superalgos-platform.jpg'
 />
 
 export default Callback
diff --git a/client/src/views/charts/index.js b/client/src/views/charts/index.js
index 29589ff2a..38eec4e9e 100644
--- a/client/src/views/charts/index.js
+++ b/client/src/views/charts/index.js
@@ -44,7 +44,7 @@ class Charts extends Component {
         size='medium'
         title=''
         text='Charts loading...'
-        backgroundUrl='https://aacorporatesitedevelop.azurewebsites.net/img/photos/superalgos-platform.jpg'
+        backgroundUrl='https://advancedalgos.net/img/photos/superalgos-platform.jpg'
       />
     )
   }
diff --git a/client/src/views/email-verification/components/SignupVerifyResponse.js b/client/src/views/email-verification/components/SignupVerifyResponse.js
index 94c573c90..fca6419d6 100644
--- a/client/src/views/email-verification/components/SignupVerifyResponse.js
+++ b/client/src/views/email-verification/components/SignupVerifyResponse.js
@@ -36,7 +36,7 @@ export class SignupVerifyResponse extends React.Component {
           size='big'
           title={BannerTitle}
           text={BannerText}
-          backgroundUrl='https://aacorporatesitedevelop.azurewebsites.net/img/photos/superalgos-platform.jpg'
+          backgroundUrl='https://advancedalgos.net/img/photos/superalgos-platform.jpg'
         />
       )
     }
@@ -52,7 +52,7 @@ export class SignupVerifyResponse extends React.Component {
               size='big'
               title='Mailing Sign-Up Complete!'
               text='We look forward to keeping you up-to-date on the Advanced Algos project.'
-              backgroundUrl='https://aacorporatesitedevelop.azurewebsites.net/img/photos/superalgos-platform.jpg'
+              backgroundUrl='https://advancedalgos.net/img/photos/superalgos-platform.jpg'
             >
               {displayForm && <SignupForm alignCenter />}
             </BannerTopBar>
@@ -65,7 +65,7 @@ export class SignupVerifyResponse extends React.Component {
           size='big'
           title='Processing...'
           text=''
-          backgroundUrl='https://aacorporatesitedevelop.azurewebsites.net/img/photos/superalgos-platform.jpg'
+          backgroundUrl='https://advancedalgos.net/img/photos/superalgos-platform.jpg'
         />
       )
     }
diff --git a/client/src/views/email-verification/index.js b/client/src/views/email-verification/index.js
index 8e38064c6..dd71bc7ae 100644
--- a/client/src/views/email-verification/index.js
+++ b/client/src/views/email-verification/index.js
@@ -27,7 +27,7 @@ export const EmailSignupConfirm = ({ tokenParam }) => {
         size='big'
         title=''
         text={BannerText}
-        backgroundUrl='https://aacorporatesitedevelop.azurewebsites.net/img/photos/superalgos-platform.jpg'
+        backgroundUrl='https://advancedalgos.net/img/photos/superalgos-platform.jpg'
       />
     )
   }
diff --git a/client/src/views/home/index.js b/client/src/views/home/index.js
index db0c3856e..b1820b600 100644
--- a/client/src/views/home/index.js
+++ b/client/src/views/home/index.js
@@ -10,7 +10,7 @@ class Home extends Component {
           size='big'
           title='Advanced Algos Platform'
           text='People and machines working together to create Superalgos'
-          backgroundUrl='https://aacorporatesitedevelop.azurewebsites.net/img/photos/superalgos-platform.jpg'
+          backgroundUrl='https://advancedalgos.net/img/photos/superalgos-platform.jpg'
         />
         <div className='homePage container'>
           <Typography variant='h1' align='center' className='title'>Welcome to the Advanced Algos Platform!</Typography>
diff --git a/client/src/views/layout/footer/index.js b/client/src/views/layout/footer/index.js
index 199f4920c..c8e2dcf1c 100644
--- a/client/src/views/layout/footer/index.js
+++ b/client/src/views/layout/footer/index.js
@@ -41,7 +41,7 @@ class Footer extends Component {
                 <Typography className={classNames(classes.textLight, classes.descriptionText)} ><strong>Advanced Algos Ltd.</strong></Typography>
                 <Typography className={classNames(classes.textLight, classes.descriptionText)} gutterBottom>Ground Floor, Palace Court, Church Street,<br />St. Julians&nbsp;STJ3049, Malta</Typography>
                 <Typography className={classNames(classes.textLight, classes.descriptionText)}>
-                  <Link to='legal-privacy-statement.shtml' className={classNames(classes.textLight, classes.descriptionText)}>Privacy Statement</Link> | <a href='legal-terms-of-service.shtml' className={classes.linkLight}>Terms of Service</a>
+                  <a href='legal-privacy-statement.shtml' className={classes.linkLight}>Privacy Statement</a> | <a href='legal-terms-of-service.shtml' className={classes.linkLight}>Terms of Service</a>
                 </Typography>
                 <Typography variant='body2' className={classNames(classes.textLight, classes.copyright)} gutterBottom>&copy; Advanced Algos, Ltd. 2018 | All Rights Reserved.</Typography>
               </Grid>
diff --git a/client/src/views/layout/header/LoggedIn.js b/client/src/views/layout/header/LoggedIn.js
index 1476e6969..0758db99a 100644
--- a/client/src/views/layout/header/LoggedIn.js
+++ b/client/src/views/layout/header/LoggedIn.js
@@ -19,9 +19,10 @@ export const LoggedIn = props => {
     displayName = user.firstName
   }
 
-  if (isDefined(user.firstName) && isDefined(user.lastName)) {
-    displayName = user.firstName + ' ' + user.lastName
-  }
+  displayName = displayName.split('-')[0]
+  displayName = displayName.split('.')[0]
+  displayName = displayName.split('_')[0]
+  displayName = displayName.split(' ')[0]
 
   return (