diff --git a/src/components/Recipe/RecipeCard.js b/src/components/Recipe/RecipeCard.js
index 97f57a1..9a473b0 100644
--- a/src/components/Recipe/RecipeCard.js
+++ b/src/components/Recipe/RecipeCard.js
@@ -40,17 +40,17 @@ const RecipeCard = ({
         <div className='mt-6 flex items-center'>
           <div className='flex-shrink-0'>
             <div>
-              <span className='sr-only'>{barista.display_name}</span>
+              <span className='sr-only'>{barista?.display_name}</span>
               <img
                 className='h-10 w-10 rounded-full'
-                src={barista.avatar}
+                src={barista?.avatar}
                 alt=''
               />
             </div>
           </div>
           <div className='ml-3'>
             <div className='text-sm font-medium text-gray-900'>
-              <div className='hover:underline'>{barista.display_name}</div>
+              <div className='hover:underline'>{barista?.display_name}</div>
             </div>
             <div className='flex space-x-1 text-sm text-gray-500'>
               <time dateTime={date_added}>{date_added.substring(0, 10)}</time>
diff --git a/src/components/Recipe/RecipeDetails.js b/src/components/Recipe/RecipeDetails.js
index 2be429f..8779675 100644
--- a/src/components/Recipe/RecipeDetails.js
+++ b/src/components/Recipe/RecipeDetails.js
@@ -5,13 +5,14 @@ import RecipeReview from './Review/RecipeReview'
 import { useHistory, useParams, Link, useRouteMatch } from 'react-router-dom'
 import { roundToHalfOrWhole } from 'helper/math'
 import CreateRecipeReview from './Review/CreateRecipeReview'
+import { useAuth } from 'context/AuthContext'
 
 const RecipeDetails = (props) => {
   const history = useHistory()
   const { url } = useRouteMatch()
   const { id } = useParams()
   const [, deleteRecipe] = useMutation(DELETE_RECIPES)
-
+  const { barista: userBarista } = useAuth()
   const deleteRecipePressed = async () => {
     await deleteRecipe({ id })
     history.push(`/recipe`)
@@ -50,7 +51,6 @@ const RecipeDetails = (props) => {
     recipe_reviews,
     recipe_reviews_aggregate,
   } = data.recipes_by_pk
-
   return (
     <div className='min-h-screen bg-gray-100'>
       <main className='py-10'>
@@ -73,27 +73,31 @@ const RecipeDetails = (props) => {
             <div>
               <h1 className='text-2xl font-bold text-gray-900'>{name}</h1>
               <p className='text-sm font-medium text-gray-500'>
-                Created by {barista?.display_name} on{' '}
+                Created by {barista?.display_name} on
                 <time dateTime={date_added}>{date_added.substring(0, 10)}</time>
               </p>
             </div>
           </div>
-          <div className='mt-6 flex flex-col-reverse justify-stretch space-y-4 space-y-reverse sm:flex-row-reverse sm:justify-end sm:space-x-reverse sm:space-y-0 sm:space-x-3 md:mt-0 md:flex-row md:space-x-3'>
-            <button
-              onClick={deleteRecipePressed}
-              type='button'
-              className='inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-blue-500'
-            >
-              Delete Recipe
-            </button>
-            <Link
-              to={`${url}/edit`}
-              type='button'
-              className='inline-flex items-center justify-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-blue-500'
-            >
-              Edit Recipe
-            </Link>
-          </div>
+          {userBarista?.id === barista?.id ? (
+            <div className='mt-6 flex flex-col-reverse justify-stretch space-y-4 space-y-reverse sm:flex-row-reverse sm:justify-end sm:space-x-reverse sm:space-y-0 sm:space-x-3 md:mt-0 md:flex-row md:space-x-3'>
+              <button
+                onClick={deleteRecipePressed}
+                type='button'
+                className='inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-blue-500'
+              >
+                Delete Recipe
+              </button>
+              <Link
+                to={`${url}/edit`}
+                type='button'
+                className='inline-flex items-center justify-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-blue-500'
+              >
+                Edit Recipe
+              </Link>
+            </div>
+          ) : (
+            ''
+          )}
         </div>
 
         <div className='mt-8 max-w-3xl mx-auto grid grid-cols-1 gap-6 sm:px-6 lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-3'>
@@ -108,9 +112,7 @@ const RecipeDetails = (props) => {
                   >
                     Recipe Details
                   </h2>
-                  <p className='mt-1 max-w-2xl text-sm text-gray-500'>
-                    Personal details and application.
-                  </p>
+                  <p className='mt-1 max-w-2xl text-sm text-gray-500'></p>
                 </div>
                 <div className='border-t border-gray-200 px-4 py-5 sm:px-6'>
                   <dl className='grid grid-cols-1 gap-x-4 gap-y-8 sm:grid-cols-2'>
diff --git a/src/components/Recipe/Review/CreateRecipeReview.js b/src/components/Recipe/Review/CreateRecipeReview.js
index efa60e4..5daa86b 100644
--- a/src/components/Recipe/Review/CreateRecipeReview.js
+++ b/src/components/Recipe/Review/CreateRecipeReview.js
@@ -11,7 +11,6 @@ const CreateRecipeReview = ({ id }) => {
   })
   const { barista } = useAuth()
   const [, insertRecipeReview] = useMutation(INSERT_RECIPE_REVIEW_ONE)
-
   const onChangeGenerator = (attr) => (e) => {
     setState({
       ...state,
@@ -19,8 +18,7 @@ const CreateRecipeReview = ({ id }) => {
     })
   }
 
-  const submitReview = async (e) => {
-    e.preventDefault()
+  const submitReview = async () => {
     await insertRecipeReview({
       object: {
         barista_id: barista.id,
@@ -69,28 +67,13 @@ const CreateRecipeReview = ({ id }) => {
             />
 
             <div className='mt-3 flex items-center justify-between'>
-              {/* <div className='group inline-flex items-start text-sm space-x-2 text-gray-500 hover:text-gray-900'>
-                <svg
-                  className='flex-shrink-0 h-5 w-5 text-gray-400 group-hover:text-gray-500'
-                  xmlns='http://www.w3.org/2000/svg'
-                  viewBox='0 0 20 20'
-                  fill='currentColor'
-                  aria-hidden='true'
-                >
-                  <path
-                    fillRule='evenodd'
-                    d='M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-8-3a1 1 0 00-.867.5 1 1 0 11-1.731-1A3 3 0 0113 8a3.001 3.001 0 01-2 2.83V11a1 1 0 11-2 0v-1a1 1 0 011-1 1 1 0 100-2zm0 8a1 1 0 100-2 1 1 0 000 2z'
-                    clipRule='evenodd'
-                  />
-                </svg>
-                <span>Some HTML is okay.</span>
-              </div> */}
               <button
                 onClick={submitReview}
                 className='inline-flex items-center justify-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500'
               >
                 Add Review
               </button>
+              )}
             </div>
           </form>
         </div>
@@ -100,37 +83,3 @@ const CreateRecipeReview = ({ id }) => {
 }
 
 export default CreateRecipeReview
-// <div>
-//   <div className='font-bold'>Create Review</div>
-//   <InputRow
-//     value={barista.display_name}
-//     readOnly={true}
-//     placeholder='Enter Barista'
-//     label='Barista'
-//   />
-//   <InputRow
-//     value={name}
-//     readOnly={true}
-//     placeholder='Enter Recipe'
-//     label='Recipe'
-//   />
-//   <InputRow
-//     value={state.rating}
-//     onChange={onChangeGenerator('rating')}
-//     placeholder='Enter Rating'
-//     label='Rating'
-//   />
-//   <InputRow
-//     value={state.comment}
-//     onChange={onChangeGenerator('comment')}
-//     placeholder='Enter Comment'
-//     label='Comment'
-//   />
-//   <button
-//     type='button'
-//     onClick={submitReview}
-//     className='mb-4 inline-flex items-center px-4 py-2 border border-transparent text-sm leading-5 font-medium rounded-md text-white bg-blue-600 hover:bg-blue-500 focus:outline-none focus:border-blue-700 focus:shadow-outline-blue active:bg-blue-700 transition ease-in-out duration-150'
-//   >
-//     submit review
-//   </button>
-// </div>
diff --git a/src/components/Recipe/Review/RecipeReview.js b/src/components/Recipe/Review/RecipeReview.js
index 0291399..8aee9d0 100644
--- a/src/components/Recipe/Review/RecipeReview.js
+++ b/src/components/Recipe/Review/RecipeReview.js
@@ -1,6 +1,7 @@
 import { useRouteMatch, Link } from 'react-router-dom'
 import { DELETE_RECIPE_REVIEW } from 'queries'
 import { useMutation } from 'urql'
+import { useAuth } from 'context/AuthContext'
 
 const RecipeReview = ({ recipe_reviews }) => {
   const { url } = useRouteMatch()
@@ -8,6 +9,8 @@ const RecipeReview = ({ recipe_reviews }) => {
   const deleteReviewPressed = async (id) => {
     await deleteReview({ id })
   }
+  const { barista: userBarista } = useAuth()
+
   return (
     <div>
       <ul className='space-y-8'>
@@ -39,22 +42,32 @@ const RecipeReview = ({ recipe_reviews }) => {
                     <span className='text-gray-500 font-medium'>
                       {n.date_added.substring(0, 10)}
                     </span>
-                    <span className='text-gray-500 font-medium'>&middot;</span>
-                    <Link
-                      to={`${url}/review/${n.id}/edit`}
-                      type='button'
-                      className='text-gray-900 font-medium'
-                    >
-                      Edit
-                    </Link>
-                    <span className='text-gray-500 font-medium'>&middot;</span>
-                    <button
-                      onClick={() => deleteReviewPressed(n.id)}
-                      type='button'
-                      className='text-gray-900 font-medium'
-                    >
-                      Delete
-                    </button>
+                    {userBarista?.id === n.barista?.id ? (
+                      <div>
+                        <span className='text-gray-500 font-medium'>
+                          &middot;
+                        </span>
+                        <Link
+                          to={`${url}/review/${n.id}/edit`}
+                          type='button'
+                          className='text-gray-900 font-medium'
+                        >
+                          Edit
+                        </Link>
+                        <span className='text-gray-500 font-medium'>
+                          &middot;
+                        </span>
+                        <button
+                          onClick={() => deleteReviewPressed(n.id)}
+                          type='button'
+                          className='text-gray-900 font-medium'
+                        >
+                          Delete
+                        </button>
+                      </div>
+                    ) : (
+                      ''
+                    )}
                   </div>
                 </div>
               </div>