diff --git a/.env b/.env
index ea1372f..08e064a 100644
--- a/.env
+++ b/.env
@@ -1 +1,4 @@
-ESLINT_NO_DEV_ERRORS=true
\ No newline at end of file
+ESLINT_NO_DEV_ERRORS=true
+
+REACT_APP_AUX_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
+REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
diff --git a/.env.development b/.env.development
new file mode 100644
index 0000000..7b89cab
--- /dev/null
+++ b/.env.development
@@ -0,0 +1,4 @@
+ESLINT_NO_DEV_ERRORS=true
+
+REACT_APP_AUX_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
+REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
\ No newline at end of file
diff --git a/.env.production b/.env.production
new file mode 100644
index 0000000..7b89cab
--- /dev/null
+++ b/.env.production
@@ -0,0 +1,4 @@
+ESLINT_NO_DEV_ERRORS=true
+
+REACT_APP_AUX_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
+REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index 44c1f41..8dcd232 100755
--- a/public/index.html
+++ b/public/index.html
@@ -55,6 +55,9 @@
     <!--
       need jv8
     -->
+    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/popper.js@1.14.7/dist/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
   </body>
   <script>var LHC_API = LHC_API||{};
     LHC_API.args = {mode:'widget',lhc_base_url:'//chat.live.wrenchboard.com/',wheight:450,wwidth:350,pheight:520,pwidth:500,leaveamessage:true,check_messages:false};
diff --git a/src/Routes.js b/src/Routes.js
index 537418f..3e11ec3 100644
--- a/src/Routes.js
+++ b/src/Routes.js
@@ -20,6 +20,7 @@ import UseCases from './components/UseCases';
 
 import Privacy from './components/Service/Privacy';
 import Terms from './components/Service/Terms';
+import FAQ from './components/FAQ/Index';
 
 function Routes() {
     const [loading, setLoading] = useState(true);
@@ -52,7 +53,7 @@ function Routes() {
                             <Route exact path="/privacy" component={Privacy} />
                             <Route exact path="/about-us" component={AboutUs} />
                             <Route exact path="/contact" component={Contact} />
-                            <Route exact path="/faq" component={HomeOne} />
+                            <Route exact path="/faq" component={FAQ} />
                             <Route exact path="/error" component={Error} />
                             <Route component={Error} />
                         </Switch>
diff --git a/src/Services/ContactData.js b/src/Services/ContactData.js
index 7e68b8b..383b922 100644
--- a/src/Services/ContactData.js
+++ b/src/Services/ContactData.js
@@ -4,7 +4,7 @@ import getConfig from './../Config/config'
 async function ContactData(callData) {
     // debugger;
     var site = getConfig()[0];
-    let response = await Axios.post(site.user_service_endpoint + "/sitecontact", callData);
+    let response = await Axios.post(`${process.env.REACT_APP_AUX_ENDPOINT}/sitecontact`, callData);
     return response.data.result;
 }
 
diff --git a/src/components/FAQ/Index.js b/src/components/FAQ/Index.js
new file mode 100644
index 0000000..07704da
--- /dev/null
+++ b/src/components/FAQ/Index.js
@@ -0,0 +1,29 @@
+import React, { useEffect } from 'react';
+import useToggle from '../../Hooks/useToggle';
+import Drawer from '../Mobile/Drawer';
+import HeaderService from '../Service/HeaderService';
+import HeroService from '../Service/HeroService';
+import FooterHomeOne from '../HomeOne/FooterHomeOne';
+import BackToTop from '../BackToTop';
+import StickyMenu from '../../lib/StickyMenu';
+import FAQService from '../Service/FAQServices';
+
+
+function FAQ() {
+    useEffect(() => {
+        StickyMenu();
+    });
+    const [drawer, drawerAction] = useToggle(false);
+    return (
+        <>
+            <Drawer drawer={drawer} action={drawerAction.toggle} />
+            <HeaderService action={drawerAction.toggle} />
+            <HeroService title="FAQ" />
+            <FAQService />
+            <FooterHomeOne />
+            <BackToTop />
+        </>
+    );
+}
+
+export default FAQ;
\ No newline at end of file
diff --git a/src/components/HomeOne/HeroHomeOne.js b/src/components/HomeOne/HeroHomeOne.js
index 90872b3..4338c3a 100644
--- a/src/components/HomeOne/HeroHomeOne.js
+++ b/src/components/HomeOne/HeroHomeOne.js
@@ -20,6 +20,9 @@ function HeroHomeOne() {
                                 <h1 className="appie-title">
                                     Earn Money with Any Skill.
                                 </h1>
+                                <p>
+                                    The Marketplace platform to earn money with your skills, find, buy and sell professional services. Connect, build an outstanding portfolio and link to an integrated community with best services via a digital platform.
+                                </p>
                                 <ul>
                                     <li>
                                         <a href={site.apple_app}>
@@ -33,9 +36,6 @@ function HeroHomeOne() {
                                         </a>
                                     </li>
                                 </ul>
-                                <p className='mt-3'>
-                                    The marketplace to make money from your skills, find, buy and sell professional services. Connect with freelancers to get work done faster.
-                                </p>
                             </div>
                         </div>
                         <div className="col-lg-6">
diff --git a/src/components/Service/FAQServices.js b/src/components/Service/FAQServices.js
new file mode 100644
index 0000000..4c4d42f
--- /dev/null
+++ b/src/components/Service/FAQServices.js
@@ -0,0 +1,56 @@
+import React from 'react';
+import thumb from '../../assets/images/service-page.jpg';
+import ServiceSideMenu from './ServiceSideMenu';
+import getConfig from './../../Config/config'
+import {Link} from 'react-router-dom'
+
+function FAQService() {
+    var site = getConfig()[0];
+
+    let dummyFaq = [1,2,3,4,5]
+
+    return (
+        <>
+            <section className="appie-service-details-area pt-100 pb-100">
+                <div className="container">
+                    <div className="row">
+                        <div className="col-lg-4">
+                            <ServiceSideMenu />
+                        </div>
+                        <div className="col-lg-8">
+                            <div className="faq-details-content">
+                                <div className="container-fluid">
+                                    <h1 className='display-4'>Frequently asked questions</h1>
+                                </div>
+                                <div class="accordion" id="accordionExample">
+                                    {dummyFaq.map((item, index)=>(
+                                        <div key={index} class="card">
+                                            <div class="card-header" id={`heading${index}`}>
+                                            <h2 class="mb-0">
+                                                <button class="btn btn-link btn-block text-left" type="button" data-toggle="collapse" data-target={`#collapse${index}`} aria-expanded="true" aria-controls={`collapse${index}`}>
+                                                Item {index+1}
+                                                </button>
+                                            </h2>
+                                            </div>
+    
+                                            <div id={`collapse${index}`} class={`${index > 0 ? 'collapse' : 'collapse show'}`} aria-labelledby={`heading${index}`} data-parent="#accordionExample">
+                                            <div class="card-body">
+                                                Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+                                            </div>
+                                            </div>
+                                        </div>
+                                    ))}
+                                </div>
+                                <div className='container-fluid text-center'>
+                                    <p className='my-2'>Can't find an answer <Link to='/contact'>contact us</Link> </p>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </section>
+        </>
+    );
+}
+
+export default FAQService;
\ No newline at end of file