diff --git a/components/CancelBtn.jsx b/components/CancelBtn.jsx
index b9edb83..2f53957 100644
--- a/components/CancelBtn.jsx
+++ b/components/CancelBtn.jsx
@@ -6,7 +6,7 @@ const CancelBtn = () => (
     type="button"
     className="bg-gray-400 hover:bg-gray-600 text-black font-bold py-2 px-4 rounded"
   >
-    <Link to="/">
+    <Link href="/">
       <div>
         Cancel
         <span className="inline-block" style={{ height: '0.85em' }}>
diff --git a/components/Client.jsx b/components/Client.jsx
index 7876dde..8d2a51a 100644
--- a/components/Client.jsx
+++ b/components/Client.jsx
@@ -19,7 +19,7 @@ const Client = ({ id, name, email, phone, address, company, notes }) => {
             name={`edit ${name}`}
             className="bg-orange-500 hover:bg-orange-700 text-white font-bold py-2 px-4 rounded"
           >
-            <Link to="/edit/[id]" as={`/edit/${id}`}>
+            <Link href="/edit/[id]" as={`/edit/${id}`}>
               <FaRegEdit />
             </Link>
           </button>
diff --git a/components/Header.jsx b/components/Header.jsx
index 474a8f6..e043ed7 100644
--- a/components/Header.jsx
+++ b/components/Header.jsx
@@ -17,12 +17,12 @@ const Header = () => (
       <nav className="flex justify-between">
         {useRouter().pathname !== '/' && (
           <li className="self-center text-2xl hover:text-gray-500">
-            <Link to="/">Clients</Link>
+            <Link href="/">Clients</Link>
           </li>
         )}
         {useRouter().pathname !== '/add-client' && (
           <li className="self-center text-2xl hover:text-gray-500 ml-5">
-            <Link to="/add-client">Add Client</Link>
+            <Link href="/add-client">Add Client</Link>
           </li>
         )}
       </nav>
diff --git a/next.config.js b/next.config.js
index f711c2c..3c1617e 100644
--- a/next.config.js
+++ b/next.config.js
@@ -3,6 +3,7 @@ require('dotenv').config()
 module.exports = {
   env: {
     username: process.env.USERNAME,
-    mongodb: process.env.MONGODB_URI
+    mongodb: process.env.MONGODB_URI,
+    weburl: process.env.WEBURL
   }
 }
diff --git a/pages/edit/[id].jsx b/pages/edit/[id].jsx
index 63ca7c2..cf92923 100644
--- a/pages/edit/[id].jsx
+++ b/pages/edit/[id].jsx
@@ -205,7 +205,7 @@ const Edit = ({ data }) => {
 
 Edit.getInitialProps = async function (context) {
   const { id } = context.query
-  const res = await fetch(`${process.env.WEBURL}/api/get-client?id=${id}`)
+  const res = await fetch(`${process.env.weburl}/api/get-client?id=${id}`)
   const data = await res.json()
 
   return { data: data.user }
diff --git a/pages/index.jsx b/pages/index.jsx
index 75fbb5c..d133c6c 100644
--- a/pages/index.jsx
+++ b/pages/index.jsx
@@ -23,7 +23,7 @@ const Home = ({ clients }) => (
       </tbody>
     </table>
     <div className="text-center p-5">
-      <Link to="/add-client">
+      <Link href="/add-client">
         <button className="bg-green-700 hover:bg-green-900 text-white font-bold py-2 px-4 rounded text-2xl">
           <div>
             Add{' '}
@@ -41,7 +41,7 @@ const Home = ({ clients }) => (
 )
 
 Home.getInitialProps = async function () {
-  const res = await fetch(`${process.env.WEBURL}/api/clients`)
+  const res = await fetch(`${process.env.weburl}/api/clients`)
   const data = await res.json()
 
   return {