diff --git a/.env b/.env
index f29de0a..47f7367 100644
--- a/.env
+++ b/.env
@@ -8,6 +8,10 @@ REACT_APP_APIGATE='http://float-gat.dev.chiefsoft.net'
 REACT_APP_APPLE_LINK='https://apps.apple.com/us/app/float-mobility/id1465369130'
 REACT_APP_GOOGLE_PLAY_LINK='https://apps.apple.com/us/app/float-mobility/id1465369130'
 
-REACT_APP_AUX_ENDPOINT='https://float-gat.dev.chiefsoft.net/en/floatweb/api/v1/'
+REACT_APP_FACEBOOK_LINK='https://www.facebook.com/tryfloat'
+REACT_APP_TWITTER_LINK='https://twitter.com/tryfloat/'
+REACT_APP_LINKEDIN_LINK="https://www.linkedin.com/company/float-mobility/"
+REACT_APP_INSTAGRAM_LINK="https://www.instagram.com/company/float-mobility/"
 
 REACT_APP_IMAGE_LINK='https://blog.float.sg/wp-content/uploads/'
+REACT_APP_AUX_ENDPOINT='https://float-gat.dev.chiefsoft.net/en/floatweb/api/v1/'
diff --git a/src/components/Footer.js b/src/components/Footer.js
index d9b1cf8..0399da2 100644
--- a/src/components/Footer.js
+++ b/src/components/Footer.js
@@ -45,10 +45,10 @@ class Footer extends React.Component {
 								</div>
 								<div className="col-sm-6 col-md-8 col-lg-3">
 									<div className="footer-store-badges text-right mb-40">
-										<Link to="/#" className="store">
+										<Link to={process.env.REACT_APP_APPLE_LINK} className="store">
 											<img className="appstore" src="assets/images/appstore.png" alt="appstore-badge" />
 										</Link>
-										<Link to="/#" className="store">
+										<Link to={process.env.REACT_APP_GOOGLE_PLAY_LINK} className="store">
 											<img className="googleplay" src="assets/images/googleplay.png" alt="googleplay-badge" />
 										</Link> 
 									</div>
diff --git a/src/index.js b/src/index.js
index c7ea92f..c984790 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,18 +1,18 @@
 import React from 'react';
-import ReactDOM from 'react-dom';
+import ReactDOM from 'react-dom/client';
 import './index.css';
 import App from './App';
 import reportWebVitals from './reportWebVitals';
 
 import { BrowserRouter } from "react-router-dom";
 
-ReactDOM.render(
- // basename='/usr/src/app/build'
+const rootElement = document.getElementById('root');
+const root = ReactDOM.createRoot(rootElement);
+
+root.render(
   <BrowserRouter>
     <App />
-  </BrowserRouter>,
-
-  document.getElementById('root')
+  </BrowserRouter>
 );
 
 // If you want to start measuring performance in your app, pass a function
diff --git a/src/pages/About.js b/src/pages/About.js
index 9ad89cc..0bed2a1 100644
--- a/src/pages/About.js
+++ b/src/pages/About.js
@@ -5,21 +5,16 @@ class About extends React.Component {
     render() {
         return(
             <div>
-
-
-        {/* PRELOADER SPINNER
-		============================================= */}	
+        {/* PRELOADER SPINNER */}	
         <div id="loader-wrapper">
           <div id="loading">
             <span className="cssload-loader"><span className="cssload-loader-inner" /></span>
           </div>
         </div>
-        {/* PAGE CONTENT
-		============================================= */}	
+        {/* PAGE CONTENT */}	
         <div id="page" className="page">
           
-          {/* PAGE HERO
-			============================================= */}	
+          {/* PAGE HERO */}	
           <div id="about-page" className="rel purple_gradient bg_shape_01 page-hero-section division">
             <div className="container">	
               <div className="row">	
@@ -34,8 +29,7 @@ class About extends React.Component {
               </div>	  {/* End row */}
             </div>	   {/* End container */} 
           </div>	{/* END PAGE HERO */}	
-          {/* ABOUT-2
-			============================================= */}
+          {/* ABOUT-2 */}
           <div id="about-2" className="wide-90 about-section division">
             <div className="container">
               {/* TEXT BLOCK */}	
@@ -111,11 +105,8 @@ class About extends React.Component {
                 </div>
               </div>	{/* END BUTTON */}
             </div>	   {/* End container */}	
-          </div>	{/* END ABOUT-2 */}
-          
-       
-          {/* TEAM-1
-			============================================= */}
+          </div>	{/* END ABOUT-2 */}     
+          {/* TEAM-1 */}
           <section id="team-1" className="wide-60 team-section division">
             <div className="container">
               {/* SECTION TITLE */}	
@@ -133,8 +124,6 @@ class About extends React.Component {
               <div className="team-members-holder pc-20 text-center">
                 <div className="row justify-content-center">
                   {Testimonial.map(({name, title, image, link: {domain, href}}, idx) => (
-                    <>
-                    {/* TEAM MEMBER #1 */}
                     <div className="col-sm-6 col-lg-3" key={idx}>
                       <div className="team-member wow fadeInUp" data-wow-delay="0.4s">
                         {/* Team Member Photo */}
@@ -148,16 +137,13 @@ class About extends React.Component {
                           <span><a href={href} className="grey-color">@{domain}</a></span>
                         </div>	
                       </div>									
-                    </div>	
-                    {/* END TEAM MEMBER #1 */}
-                    </>
+                    </div>
                   ))}
                 </div>   {/* End row */}
               </div>	{/* TEAM MEMBERS HOLDER */}	   
             </div>	    {/* End container */}
           </section>	{/* END TEAM-1 */}
-          {/* NEWSLETTER-1
-			============================================= */}
+          {/* NEWSLETTER-1 */}
           <section id="newsletter-1" className="pb-20 newsletter-section division">
             <div className="container">
               <div className="newsletter-wrapper bg-white">
@@ -187,8 +173,7 @@ class About extends React.Component {
                 </div>	  {/* End row */}
               </div>    {/* End newsletter-holder */}
             </div>	   {/* End container */}	
-          </section>	{/* END NEWSLETTER-1 */}
-         
+          </section>	{/* END NEWSLETTER-1 */}       
         </div>	{/* END PAGE CONTENT */}
             </div>
         )
diff --git a/src/pages/Faqs.js b/src/pages/Faqs.js
index 224ba64..4fd8b32 100644
--- a/src/pages/Faqs.js
+++ b/src/pages/Faqs.js
@@ -4,23 +4,16 @@ class Faqs extends React.Component {
     render() {
         return(
             <div>
-
-
-                    {/* PRELOADER SPINNER
-		============================================= */}	
+          {/* PRELOADER SPINNER */}	
         <div id="loader-wrapper">
           <div id="loading">
             <span className="cssload-loader"><span className="cssload-loader-inner" /></span>
           </div>
         </div>
-        {/* PAGE CONTENT
-		============================================= */}	
+        {/* PAGE CONTENT */}	
         <div id="page" className="page">
-          {/* HEADER
-			============================================= */}
-
-          {/* FAQs-2
-			============================================= */}
+          {/* HEADER */}
+          {/* FAQs-2 */}
           <section id="faqs-2" className="bg_whitesmoke hero-offset-nav pb-100 faqs-section division">				
             <div className="container">
               {/* SECTION TITLE */}	
@@ -182,8 +175,7 @@ class Faqs extends React.Component {
             {/* GEOMETRIC OVERLAY */}	
             <div className="bg_fixed geometric_overlay" />
           </section>	{/* END FAQs-2 */}
-          {/* DOWNLOAD-2
-			============================================= */}
+          {/* DOWNLOAD-2 */}
           <section id="download-2" className="bg_whitesmoke pb-20 download-section division">
             <div className="container white-color">
               <div className="rel purple_gradient bg_shape_01 downloads-2-wrapper">
@@ -206,11 +198,11 @@ class Faqs extends React.Component {
                   <div className="col-lg-5 text-right">
                     <div className="stores-badge">
                       {/* AppStore */}
-                      <a href="#" className="store">
+                      <a href={process.env.REACT_APP_APPLE_LINK} className="store">
                         <img className="appstore" src="assets/images/appstore-white.png" alt="appstore-logo" />
                       </a>
                       {/* Google Play */}
-                      <a href="#" className="store">
+                      <a href={process.env.REACT_APP_GOOGLE_PLAY_LINK} className="store">
                         <img className="googleplay" src="assets/images/googleplay-white.png" alt="googleplay-logo" />
                       </a>
                     </div>	
@@ -219,12 +211,8 @@ class Faqs extends React.Component {
               </div>    {/* End row */}
             </div>	   {/* End container */}	
           </section>	{/* END DOWNLOAD-2 */}
-         
         </div>	{/* END PAGE CONTENT */}
-  
-
-
-            </div>
+        </div>
         )
     }
 }