diff --git a/app/web/src/components/KeyValue/KeyValue.tsx b/app/web/src/components/KeyValue/KeyValue.tsx
index f05aeea..5d93378 100644
--- a/app/web/src/components/KeyValue/KeyValue.tsx
+++ b/app/web/src/components/KeyValue/KeyValue.tsx
@@ -1,27 +1,47 @@
 import Svg from 'src/components/Svg/Svg'
 
+interface EditToggleType {
+  hasPermissionToEdit: boolean
+  onEdit?: React.MouseEventHandler
+  isEditing?: boolean
+}
+
+const EditToggle = ({
+  onEdit = () => { console.error('Field declared editable without edit action.') },
+  isEditing = false,
+} : EditToggleType) => (
+    (isEditing ? (
+      <button
+        className="font-fira-sans text-ch-gray-300 items-center ml-4 grid grid-flow-col-dense p-px px-2 gap-2 bg-ch-blue-500 bg-opacity-50 hover:bg-opacity-70 rounded-sm"
+        id="rename-button"
+        onClick={onEdit}
+      >
+        <Svg name="check" className="w-6 h-6" strokeWidth={3} />
+        <span>Update</span>
+      </button>
+    ) : (
+      <button onClick={onEdit}>
+        <Svg name="pencil-solid" className="h-4 w-4 ml-4 mb-2" />
+      </button>
+    ))
+)
+
 interface KeyValueType {
   keyName: string
   children: React.ReactNode
-  hide?: boolean
-  canEdit?: boolean
-  onEdit?: () => void
-  isEditable?: boolean
   bottom?: boolean
   className?: string
+  edit?: EditToggleType
 }
 
 const KeyValue = ({
   keyName,
   children,
-  hide = false,
-  canEdit = false,
-  onEdit,
-  isEditable = false,
   bottom = false,
   className = '',
+  edit = { hasPermissionToEdit: false },
 }: KeyValueType) => {
-  if (!children || hide) return null
+  if (!children) return null
   return (
     <div className={'flex flex-col ' + className}>
       <div
@@ -30,22 +50,8 @@ const KeyValue = ({
           (bottom ? 'order-2' : '')
         }
       >
-        <span className={isEditable ? 'text-ch-blue-300' : ''}>{keyName}</span>
-        {canEdit &&
-          (isEditable ? (
-            <button
-              className="font-fira-sans text-ch-gray-300 items-center ml-4 grid grid-flow-col-dense p-px px-2 gap-2 bg-ch-blue-500 bg-opacity-50 hover:bg-opacity-70 rounded-sm"
-              id="rename-button"
-              onClick={onEdit}
-            >
-              <Svg name="check" className="w-6 h-6" strokeWidth={3} />
-              <span>Update</span>
-            </button>
-          ) : (
-            <button onClick={onEdit}>
-              <Svg name="pencil-solid" className="h-4 w-4 ml-4 mb-2" />
-            </button>
-          ))}
+        <span className={edit ? 'text-ch-blue-300' : ''}>{keyName}</span>
+        {edit && edit.hasPermissionToEdit && <EditToggle {...edit} /> }
       </div>
       <div className={'text-ch-gray-300 ' + (bottom ? 'mb-1' : 'mt-1')}>
         {children}
diff --git a/app/web/src/components/ProjectCard/ProjectCard.tsx b/app/web/src/components/ProjectCard/ProjectCard.tsx
index 9f6fbd4..fa0f303 100644
--- a/app/web/src/components/ProjectCard/ProjectCard.tsx
+++ b/app/web/src/components/ProjectCard/ProjectCard.tsx
@@ -33,8 +33,8 @@ const ProjectCard = ({ title, mainImage, user, Reaction, cadPackage }) => (
       <div className="flex items-center mt-1">
         <div className="w-8 h-8 overflow-hidden rounded-full border border-ch-gray-300 shadow">
           <ImageFallback
-            imageId={user?.image} // http://res.cloudinary.com/irevdev/image/upload/c_scale,w_50/v1/CadHub/bc7smqwo9qqmrloyf9xr
-            width={80} // http://res.cloudinary.com/irevdev/image/upload/c_scale,w_300/v1/CadHub/bc7smqwo9qqmrloyf9xr
+            imageId={user?.image}
+            width={80}
           />
         </div>
         <div className="ml-3 text-lg text-ch-gray-300 font-fira-sans">
diff --git a/app/web/src/components/ProjectProfile/ProjectProfile.tsx b/app/web/src/components/ProjectProfile/ProjectProfile.tsx
index d015a09..3d4c83b 100644
--- a/app/web/src/components/ProjectProfile/ProjectProfile.tsx
+++ b/app/web/src/components/ProjectProfile/ProjectProfile.tsx
@@ -27,7 +27,7 @@ const ProjectProfile = ({
   onComment,
 }) => {
   const [comment, setComment] = useState('')
-  const [isEditable, setIsEditable] = useState(false)
+  const [isEditing, setIsEditing] = useState(false)
   const onCommentClear = () => {
     onComment(comment)
     setComment('')
@@ -36,14 +36,14 @@ const ProjectProfile = ({
   const [isReactionsModalOpen, setIsReactionsModalOpen] = useState(false)
   const { currentUser } = useAuth()
   const editorRef = useRef(null)
-  const canEdit =
+  const hasPermissionToEdit =
     currentUser?.sub === userProject.id || currentUser?.roles.includes('admin')
   const project = userProject?.Project
   const emotes = countEmotes(project?.Reaction)
   const userEmotes = project?.userReactions.map(({ emote }) => emote)
   useEffect(() => {
-    isEditable &&
-      !canEdit &&
+    isEditing &&
+      !hasPermissionToEdit &&
       navigate(
         routes.project({
           userName: userProject.userName,
@@ -55,7 +55,7 @@ const ProjectProfile = ({
   const [newDescription, setNewDescription] = useState(project?.description)
   const onDescriptionChange = (description) => setNewDescription(description())
   const onEditSaveClick = () => {
-    if (isEditable) {
+    if (isEditing) {
       onSave(project?.id, { description: newDescription })
       return
     }
@@ -108,26 +108,27 @@ const ProjectProfile = ({
                     className="px-3 py-2 rounded"
                   />
                 </div>
-                <KeyValue
+                { (project?.description || hasPermissionToEdit) && <KeyValue
                   keyName="Description"
-                  hide={!project?.description && !canEdit}
-                  canEdit={canEdit}
-                  onEdit={() => {
-                    if (!isEditable) {
-                      setIsEditable(true)
-                    } else {
-                      onEditSaveClick()
-                      setIsEditable(false)
-                    }
+                  edit={{
+                    hasPermissionToEdit,
+                    isEditing,
+                    onEdit: () => {
+                      if (!isEditing) {
+                        setIsEditing(true)
+                      } else {
+                        onEditSaveClick()
+                        setIsEditing(false)
+                      }
+                    },
                   }}
-                  isEditable={isEditable}
                 >
                   <div
                     id="description-wrap"
                     name="description"
                     className={
                       'markdown-overrides rounded-sm pb-2 mt-2' +
-                      (isEditable ? ' min-h-md' : '')
+                      (isEditing ? ' min-h-md' : '')
                     }
                     onClick={(e) =>
                       e?.target?.id === 'description-wrap' &&
@@ -137,11 +138,11 @@ const ProjectProfile = ({
                     <Editor
                       ref={editorRef}
                       defaultValue={project?.description || ''}
-                      readOnly={!isEditable}
+                      readOnly={!isEditing}
                       onChange={onDescriptionChange}
                     />
                   </div>
-                </KeyValue>
+                </KeyValue> }
                 <div className="grid grid-flow-col-dense gap-6">
                   <KeyValue keyName="Created on">
                     {new Date(project?.createdAt).toDateString()}
@@ -156,10 +157,11 @@ const ProjectProfile = ({
                     userEmotes={userEmotes}
                     onEmote={onReaction}
                     onShowProjectReactions={() => setIsReactionsModalOpen(true)}
+                    className=""
                   />
                 </KeyValue>
-                <KeyValue keyName="Comments" hide={!currentUser}>
-                  {!isEditable && (
+                { currentUser && <KeyValue keyName="Comments">
+                  {!isEditing && (
                     <>
                       {currentUser && (
                         <>
@@ -215,8 +217,8 @@ const ProjectProfile = ({
                       </ul>
                     </>
                   )}
-                </KeyValue>
-                {canEdit && (
+                </KeyValue> }
+                {hasPermissionToEdit && (
                   <>
                     <h4 className="mt-10 text-red-600">Danger Zone</h4>
                     <Button
diff --git a/app/web/src/components/UserProfile/UserProfile.tsx b/app/web/src/components/UserProfile/UserProfile.tsx
index 9f97fdc..7c300f7 100644
--- a/app/web/src/components/UserProfile/UserProfile.tsx
+++ b/app/web/src/components/UserProfile/UserProfile.tsx
@@ -1,45 +1,53 @@
-import { useState, useEffect, useRef, useReducer, ReactNode } from 'react'
+import { useEffect, useReducer } from 'react'
 import { useAuth } from '@redwoodjs/auth'
 import { Link, navigate, routes } from '@redwoodjs/router'
 import ProjectsOfUser from 'src/components/ProjectsOfUserCell'
 import IdeHeader from 'src/components/IdeHeader/IdeHeader'
 import Svg from 'src/components/Svg/Svg'
 import {
-  fieldsConfig,
+  fieldComponents,
   fieldReducer,
   UserProfileType,
-  FieldConfigType,
+  FieldType,
 } from './userProfileConfig'
 
-function buildFieldsConfig(fieldsConfig, user) {
-  Object.entries(fieldsConfig).forEach(
-    ([key, field]: [string, FieldConfigType]) => {
-      field.currentValue = field.newValue = user[key]
-      field.name = key
-    }
-  )
-
-  return fieldsConfig
+// This function initializes the state management object for each of the fields
+function buildFieldsConfig(fieldsConfig, user, hasPermissionToEdit) {
+  return Object.fromEntries(Object.keys(fieldsConfig).map(
+    (key: string): [string, FieldType] => ([key, {
+      name: key,
+      currentValue: user[key],
+      newValue: user[key],
+      isEditing: false,
+      hasPermissionToEdit,
+    }])
+  ))
 }
 
 const UserProfile = ({
   user,
-  isEditable,
+  isEditing,
   loading,
   onSave,
   error,
-  projects,
 }: UserProfileType) => {
   const { currentUser } = useAuth()
-  const hasEditPermission = currentUser?.sub === user.id
+  const hasPermissionToEdit = currentUser?.sub === user.id
   useEffect(() => {
-    isEditable &&
-      !hasEditPermission &&
+    isEditing &&
+      !hasPermissionToEdit &&
       navigate(routes.user({ userName: user.userName }))
   }, [currentUser])
 
-  const initializedFields = buildFieldsConfig(fieldsConfig, user)
+  const initializedFields = buildFieldsConfig(fieldComponents, user, hasPermissionToEdit)
   const [fields, fieldDispatch] = useReducer(fieldReducer, initializedFields)
+  const {
+    name: NameField,
+    userName: UserNameField,
+    image: ImageField,
+    bio: BioField,
+    createdAt: MemberSinceField,
+  } = fieldComponents
 
   return (
     <>
@@ -65,44 +73,45 @@ const UserProfile = ({
             {/* Side panel */}
             <section className="bg-ch-gray-760 font-fira-sans p-12 md:overflow-y-auto ch-scrollbar">
               <div className="flex gap-6">
-                {!isEditable && (
+                {!isEditing && (
                   <div className="w-28 flex-shrink-0">
-                    <fields.image.component
+                    <ImageField
                       field={fields.image}
+                      dispatch={fieldDispatch}
                       user={user}
                       save={onSave}
-                      hasEditPermission={hasEditPermission}
+                      hasPermissionToEdit={hasPermissionToEdit}
                     />
                   </div>
                 )}
                 <div>
-                  <fields.name.component
+                  <NameField
                     field={fields.name}
                     dispatch={fieldDispatch}
                     user={user}
                     save={onSave}
-                    hasEditPermission={hasEditPermission}
+                    hasPermissionToEdit={hasPermissionToEdit}
                   />
-                  <fields.userName.component
+                  <UserNameField
                     field={fields.userName}
                     dispatch={fieldDispatch}
                     user={user}
                     save={onSave}
-                    hasEditPermission={hasEditPermission}
+                    hasPermissionToEdit={hasPermissionToEdit}
                   />
                 </div>
               </div>
               <div className="mt-10">
-                <fields.bio.component
+                <BioField
                   field={fields.bio}
                   dispatch={fieldDispatch}
                   user={user}
                   save={onSave}
-                  hasEditPermission={hasEditPermission}
+                  hasPermissionToEdit={hasPermissionToEdit}
                 />
               </div>
               <div className="my-5">
-                <fields.createdAt.component field={fields.createdAt} />
+                <MemberSinceField field={fields.createdAt} />
               </div>
             </section>
             {/* Viewer */}
diff --git a/app/web/src/components/UserProfile/userProfileConfig.tsx b/app/web/src/components/UserProfile/userProfileConfig.tsx
index 666843b..cda4689 100644
--- a/app/web/src/components/UserProfile/userProfileConfig.tsx
+++ b/app/web/src/components/UserProfile/userProfileConfig.tsx
@@ -5,24 +5,42 @@ import Editor from 'rich-markdown-editor'
 import ImageUploader from 'src/components/ImageUploader'
 import { User } from 'types/graphql'
 
+export const fieldComponents = {
+  name: NameField,
+  userName: UserNameField,
+  image: ImageField,
+  bio: BioField,
+  createdAt: MemberSinceField,
+}
+
 export interface UserProfileType {
   user: User
-  isEditable: boolean
+  isEditing: boolean
   loading: boolean
   error: boolean
   onSave: Function
   projects: {}[]
 }
 
-export interface FieldConfigType {
-  name?: string // introspection ugh
-  editable: boolean
-  component?: ReactNode
-  needsRef?: boolean
-  isEditing?: boolean | undefined
-  onSave?: Function
-  currentValue?: any
-  newValue?: any
+export interface FieldType {
+  name: string
+  currentValue: any
+  newValue: any
+  isEditing: boolean
+  hasPermissionToEdit: boolean
+}
+
+export interface FieldComponentPropsType {
+  field: FieldType
+  dispatch?: React.Dispatch<Object>
+  user?: User
+  save?: Function
+  hasPermissionToEdit?: boolean
+}
+
+interface ProfileKeyValueType extends FieldComponentPropsType {
+  children: ReactNode
+  bottom: boolean
 }
 
 const ProfileKeyValue = ({
@@ -30,26 +48,27 @@ const ProfileKeyValue = ({
   dispatch,
   user,
   save,
-  hasEditPermission,
+  hasPermissionToEdit,
   children,
   bottom = false,
-}) => {
+} : ProfileKeyValueType) => {
   return (
-    <KeyValue
+    (user[field.name] && hasPermissionToEdit) && <KeyValue
       keyName={field.name}
-      hide={!user[field.name] && !hasEditPermission}
-      canEdit={hasEditPermission}
-      onEdit={() => {
-        if (field.isEditing) {
-          save(user.userName, { [field.name]: field.newValue })
-        }
-        dispatch({
-          type: 'SET_CURRENT_VALUE',
-          payload: { field: field.name, value: field.newValue },
-        })
-        dispatch({ type: 'TOGGLE_EDITING', payload: field.name })
+      edit={{
+        hasPermissionToEdit,
+        isEditing: field.isEditing,
+        onEdit: () => {
+          if (field.isEditing && field.currentValue !== field.newValue) {
+            save(user.userName, { [field.name]: field.newValue })
+          }
+          dispatch({
+            type: 'SET_CURRENT_VALUE',
+            payload: { field: field.name, value: field.newValue },
+          })
+          dispatch({ type: 'TOGGLE_EDITING', payload: field.name })
+        },
       }}
-      isEditable={hasEditPermission && field.isEditing}
       bottom={bottom}
       className="mb-4"
     >
@@ -58,148 +77,115 @@ const ProfileKeyValue = ({
   )
 }
 
-const bioField: FieldConfigType = {
-  editable: true,
-  needsRef: true,
-  component: (props) => {
-    const ref = useRef(null)
+function BioField(props) {
+  const ref = useRef(null)
+  const { field, dispatch } = props
 
-    const { dispatch, field } = props
-
-    return (
-      <ProfileKeyValue {...props}>
-        <div
-          id="bio-wrap"
-          name="bio"
-          className={
-            'markdown-overrides rounded-sm pb-2 mt-2' +
-            (field.isEditable ? ' min-h-md' : '')
+  return (
+    <ProfileKeyValue {...props}>
+      <div
+        id="bio-wrap"
+        name="bio"
+        className={
+          'markdown-overrides rounded-sm pb-2 mt-2' +
+          (field.isEditing ? ' min-h-md' : '')
+        }
+        onClick={(e) =>
+          e?.target?.id === 'bio-wrap' && ref?.current?.focusAtEnd()
+        }
+      >
+        <Editor
+          ref={ref}
+          defaultValue={field?.currentValue || ''}
+          readOnly={!field.isEditing}
+          onChange={(bio) =>
+            dispatch({
+              type: 'SET_NEW_VALUE',
+              payload: { field: 'bio', value: bio() },
+            })
           }
-          onClick={(e) =>
-            e?.target?.id === 'bio-wrap' && ref?.current?.focusAtEnd()
+        />
+      </div>
+    </ProfileKeyValue>
+  )
+}
+
+function MemberSinceField(props : FieldComponentPropsType) {
+  return (
+    <KeyValue keyName="Member Since">
+      <p className="text-ch-gray-300">
+        {new Date(props.field.currentValue).toLocaleDateString()}
+      </p>
+    </KeyValue>
+  )
+}
+
+function ImageField(props : FieldComponentPropsType) {
+  const { field, user, save, hasPermissionToEdit } = props
+  return (
+    <ImageUploader
+      className="rounded-3xl rounded-tr-none shadow-md border-2 border-ch-gray-300"
+      onImageUpload={({ cloudinaryPublicId: image }) => {
+        save(user.userName, {
+          image,
+        })
+      }}
+      aspectRatio={1}
+      isEditable={hasPermissionToEdit}
+      imageUrl={user.image}
+      width={300}
+    />
+  )
+}
+
+function NameField(props : FieldComponentPropsType) {
+  const { user, dispatch, field } = props
+
+  return (
+    <ProfileKeyValue {...props} bottom={true}>
+      {!field.isEditing ? (
+        <h1 className="text-4xl">{user?.name}</h1>
+      ) : (
+        <InputText
+          className="text-xl"
+          value={field.newValue}
+          onChange={({ target: { value } }) =>
+            dispatch({
+              type: 'SET_NEW_VALUE',
+              payload: { field: 'name', value },
+            })
           }
-        >
-          <Editor
-            ref={ref}
-            defaultValue={field?.currentValue || ''}
-            readOnly={!field.isEditing}
-            onChange={(bio) =>
-              dispatch({
-                type: 'SET_NEW_VALUE',
-                payload: { field: field.bio, value: bio() },
-              })
-            }
-          />
-        </div>
-      </ProfileKeyValue>
-    )
-  },
+          isEditable={field.isEditing}
+        />
+      )}
+    </ProfileKeyValue>
+  )
 }
 
-const createdAtField: FieldConfigType = {
-  editable: false,
-  component: (props) => {
-    const { field } = props
+function UserNameField(props : FieldComponentPropsType) {
+  const { dispatch, field } = props
 
-    return (
-      <KeyValue keyName="Member Since">
-        <p className="text-ch-gray-300">
-          {new Date(field.currentValue).toLocaleDateString()}
-        </p>
-      </KeyValue>
-    )
-  },
-}
-
-const imageField: FieldConfigType = {
-  editable: true,
-  component: (props) => {
-    const { field, user, save, hasEditPermission } = props
-    return (
-      <ImageUploader
-        className="rounded-3xl rounded-tr-none shadow-md border-2 border-ch-gray-300"
-        onImageUpload={({ cloudinaryPublicId: image }) => {
-          save(user.userName, {
-            image,
-          })
-        }}
-        aspectRatio={1}
-        isEditable={hasEditPermission && !field.isEditing}
-        imageUrl={user.image}
-        width={300}
-      />
-    )
-  },
-}
-
-const nameField: FieldConfigType = {
-  editable: true,
-  component: (props) => {
-    const { user, dispatch, field } = props
-
-    return (
-      <ProfileKeyValue {...props} bottom={true}>
-        {!field.isEditing ? (
-          <h1 className="text-4xl">{user?.name}</h1>
-        ) : (
-          <InputText
-            className="text-xl"
-            value={field.newValue}
-            onChange={({ target: { value } }) =>
-              dispatch({
-                type: 'SET_NEW_VALUE',
-                payload: { field: field.name, value },
-              })
-            }
-            isEditable={!field.isEditable}
-          />
-        )}
-      </ProfileKeyValue>
-    )
-  },
-}
-
-const userNameField: FieldConfigType = {
-  editable: true,
-  component: (props) => {
-    const { dispatch, field } = props
-
-    return (
-      <ProfileKeyValue {...props} bottom={true}>
-        {!field.isEditing ? (
-          <h2 className="text-ch-gray-400">
-            @{field?.currentValue?.replace(/([^a-zA-Z\d_:])/g, '-')}
-          </h2>
-        ) : (
-          <InputText
-            className="text-xl"
-            value={field.newValue}
-            onChange={({ target: { value } }) =>
-              dispatch({
-                type: 'SET_NEW_VALUE',
-                payload: { field: field.name, value },
-              })
-            }
-            isEditable={!field.isEditable}
-          />
-        )}
-      </ProfileKeyValue>
-    )
-  },
-}
-
-export const fieldsConfig = {
-  bio: bioField,
-  createdAt: createdAtField,
-  id: {
-    editable: false,
-  },
-  image: imageField,
-  name: nameField,
-  updatedAt: {
-    editable: false,
-  },
-  userName: userNameField,
+  return (
+    <ProfileKeyValue {...props} bottom={true}>
+      {!field.isEditing ? (
+        <h2 className="text-ch-gray-400">
+          @{field?.currentValue?.replace(/([^a-zA-Z\d_:])/g, '-')}
+        </h2>
+      ) : (
+        <InputText
+          className="text-xl"
+          value={field.newValue}
+          onChange={({ target: { value } }) =>
+            dispatch({
+              type: 'SET_NEW_VALUE',
+              payload: { field: 'userName', value },
+            })
+          }
+          isEditable={field.isEditing}
+        />
+      )}
+    </ProfileKeyValue>
+  )
 }
 
 export function fieldReducer(state, action) {
@@ -210,7 +196,7 @@ export function fieldReducer(state, action) {
         [action.payload]: {
           ...state[action.payload],
           isEditing:
-            state[action.payload].editable && !state[action.payload].isEditing
+            state[action.payload].hasPermissionToEdit && !state[action.payload].isEditing
               ? true
               : false,
         },
diff --git a/app/web/src/pages/UserPage/UserPage.js b/app/web/src/pages/UserPage/UserPage.js
index 38072c9..661d770 100644
--- a/app/web/src/pages/UserPage/UserPage.js
+++ b/app/web/src/pages/UserPage/UserPage.js
@@ -1,11 +1,13 @@
 import MainLayout from 'src/layouts/MainLayout'
 import EditUserCell from 'src/components/EditUserCell'
 import Seo from 'src/components/Seo/Seo'
+import { Toaster } from '@redwoodjs/web/toast'
 
 const UserPage = ({ userName }) => {
   return (
     <>
       <Seo title={userName} description="User page" lang="en-US" />
+      <Toaster timeout={9000} />
 
       <EditUserCell userName={userName} />
     </>