diff --git a/README.md b/README.md
index f1acf93..6094106 100644
--- a/README.md
+++ b/README.md
@@ -78,3 +78,4 @@ Free meal planner for cooks short on ideas! (like me …)
 ## TO DO
 
 - put a preloader
+- on mealPage add link to catergory and origin
diff --git a/src/App.js b/src/App.js
index d6f260a..35aa7d5 100644
--- a/src/App.js
+++ b/src/App.js
@@ -12,10 +12,11 @@ import Footer from "./components/Footer";
 import "./index.css";
 
 const App = () => {
-  // const [isLoading, setIsLoading] = useState(true); For Preloader
+  // State Hooks
   const [searchString, setSearchString] = useState("");
   const [categories, setCategories] = useState({ categories: [] });
-  // Find a better alternative …
+  // const [isLoading, setIsLoading] = useState(true); For Preloader
+  // Default meal object. TODO: Find a better alternative …
   const mealDef = {
     meals: [
       {
@@ -77,41 +78,48 @@ const App = () => {
   };
   const [meal, setMeal] = useState(mealDef);
 
-  const createURI = (keyword, filter) => {
-    if (filter === null) {
-      const ROOT = "https://www.themealdb.com/api/json/v1/1/";
+  // Fetch API functions
+  const createURI = (keyword, option) => {
+    const ROOT = "https://www.themealdb.com/api/json/v1/1/";
+    if (option === null) {
       return `${ROOT}${keyword}.php`;
-    } else {
-      const ROOT = "https://www.themealdb.com/api/json/v1/1/filter.php?c=";
-      return `${ROOT}${keyword}`;
+    } else if (option === "filter") {
+      return `${ROOT}${option}.php?c=${keyword}`;
+    } else if (option === "lookup") {
+      return `${ROOT}${option}.php?i=${keyword}`;
     }
   };
+  const getFromAPI = (keyword, set, option = null) => {
+    const URI = createURI(keyword, option);
+    fetch(URI)
+      .then(response => response.json())
+      .then(data => set(data));
+  };
 
-  const getMeal = () => {
+  // Fetch wrappers for each use
+  const getRandomMeal = () => {
     // setIsLoading(true);
     getFromAPI("random", setMeal);
     // setIsLoading(false);
   };
 
+  const getMeal = id => {
+    getFromAPI(id, setMeal, "lookup");
+  };
+
   const getCategories = () => {
     getFromAPI("categories", setCategories);
   };
 
-  const getFromAPI = (keyword, set, filter = null) => {
-    const URI = createURI(keyword, filter);
-    fetch(URI)
-      .then(response => response.json())
-      .then(data => set(data));
-  };
-
   const handleChange = ev => {
     const { value } = ev.target;
     setSearchString(value);
   };
+  const buttonUrl = "/random";
 
   return (
     <Router>
-      <Navbar handleClick={getMeal} />
+      <Navbar handleClick={getRandomMeal} buttonUrl={buttonUrl} />
       <div className="container">
         <SearchBar searchString={searchString} handleChange={handleChange} />
       </div>
@@ -119,16 +127,22 @@ const App = () => {
         <Route
           exact
           path="/"
-          render={props => <HomePage {...props} handleClick={getMeal} />}
+          render={props => (
+            <HomePage
+              {...props}
+              handleClick={getRandomMeal}
+              buttonUrl={buttonUrl}
+            />
+          )}
         />
         <Route
           exact
-          path="/meal"
+          path={buttonUrl}
           render={props => (
             <MealPage
               {...props}
               meal={meal}
-              getMeal={getMeal}
+              getMeal={getRandomMeal}
               // isLoading={isLoading}
             />
           )}
@@ -144,17 +158,21 @@ const App = () => {
             />
           )}
         />
-        <Route path="/categories/:strCategory">
-          <CategoryPage getFromAPI={getFromAPI} setMeal={setMeal} />
+        <Route path="/categories/:strCategory/">
+          <CategoryPage
+            getFromAPI={getFromAPI}
+            getMeal={getMeal}
+            setMeal={setMeal}
+            meal={meal}
+          />
         </Route>
-
-        <Route path="/categories/:strCategory/:strMeal">
+        <Route path="/:idMeal">
           <MealPage meal={meal} getMeal={getMeal} />
         </Route>
         <Route exact path="/search" component={SearchPage} />
         {/* We'll have to input searchResults somewhere */}
         <Route
-          render={props => <NotFound {...props} handleClick={getMeal} />}
+          render={props => <NotFound {...props} handleClick={getRandomMeal} />}
         />
       </Switch>
       <Footer />
diff --git a/src/components/Navbar.js b/src/components/Navbar.js
index 8759a43..a4d45d6 100644
--- a/src/components/Navbar.js
+++ b/src/components/Navbar.js
@@ -15,7 +15,10 @@ const Navbar = props => {
               <Link to="/categories">Categories</Link>
             </li>
             <li>
-              <RandomButton handleClick={props.handleClick} />
+              <RandomButton
+                handleClick={props.handleClick}
+                url={props.buttonUrl}
+              />
             </li>
           </ul>
         </div>
diff --git a/src/components/RandomButton.js b/src/components/RandomButton.js
index 0581bd9..3bb6c1d 100644
--- a/src/components/RandomButton.js
+++ b/src/components/RandomButton.js
@@ -3,7 +3,7 @@ import { Link } from "react-router-dom";
 
 const RandomButton = props => {
   return (
-    <Link to="/meal">
+    <Link to={props.url}>
       <button
         className="waves-effect waves-light btn-small"
         onClick={props.handleClick}
diff --git a/src/pages/Category.js b/src/pages/Category.js
index 2cc3fb9..b88e616 100644
--- a/src/pages/Category.js
+++ b/src/pages/Category.js
@@ -1,12 +1,5 @@
 import React, { useEffect, useState } from "react";
-import {
-  useParams,
-  Link,
-  useRouteMatch,
-  Switch,
-  Route
-} from "react-router-dom";
-import MealPage from "./Meal";
+import { useParams, Link, useRouteMatch } from "react-router-dom";
 
 const CategoryPage = props => {
   const [meals, setMeals] = useState({ meals: [] });
@@ -14,13 +7,7 @@ const CategoryPage = props => {
   const { strCategory } = useParams();
 
   const getMeals = () => {
-    getFromAPI(strCategory, setMeals, 0);
-  };
-
-  const getMeal = () => {
-    // setIsLoading(true);
-    getFromAPI("random", props.setMeal);
-    // setIsLoading(false);
+    getFromAPI(strCategory, setMeals, "filter");
   };
 
   useEffect(() => {
@@ -38,21 +25,16 @@ const CategoryPage = props => {
     <div className="container">
       <h1>Chef's {strCategory} Recipes</h1>
       {/* <img src={strCategoryThumb} alt={strCategory} />
-      <p>{strCategoryDescription}</p> */}
+  <p>{strCategoryDescription}</p> */}
 
       <ul>
         {meals.meals.map((meal, i) => (
           <li key={i}>
-            <Link to={`${url}/${meal.strMeal}`}>
-              {/* <Link to="/meal"> */}
+            <Link to={`/${meal.idMeal}`}>
+              {/* <Link to="/"> */}
               <img src={meal.strMealThumb} alt={meal.strMeal} />
               <h3>{meal.strMeal}</h3>
             </Link>
-            <Switch>
-              <Route path={`${url}/${meal.strMeal}`}>
-                <MealPage meal={meal} getMeal={getMeal} />
-              </Route>
-            </Switch>
           </li>
         ))}
       </ul>
diff --git a/src/pages/Home.js b/src/pages/Home.js
index 32d409a..4d46550 100644
--- a/src/pages/Home.js
+++ b/src/pages/Home.js
@@ -6,7 +6,7 @@ const HomePage = props => {
     <div className="section background">
       <div className="container center-align">
         <h1>The Chef's Meal Suggestions</h1>
-        <RandomButton handleClick={props.handleClick} />
+        <RandomButton handleClick={props.handleClick} url={props.buttonUrl} />
       </div>
     </div>
   );
diff --git a/src/pages/Meal.js b/src/pages/Meal.js
index ca46700..90cab77 100644
--- a/src/pages/Meal.js
+++ b/src/pages/Meal.js
@@ -2,14 +2,16 @@ import React, { useEffect } from "react";
 import MealPresentation from "../components/MealPresentation";
 import IngredientList from "../components/IngredientList";
 import Recipe from "../components/Recipe";
+import { useParams } from "react-router-dom";
 // import PreLoader from "../components/PreLoader";
 
 const MealPage = props => {
   const meal = props.meal.meals[0];
   const { getMeal } = props;
+  const { idMeal } = useParams();
 
   useEffect(() => {
-    getMeal();
+    idMeal === null ? getMeal() : getMeal(idMeal);
   }, []);
 
   const {