diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail.elm b/modules/webapp/src/main/elm/Comp/ItemDetail.elm
index 03fb356b..c093e023 100644
--- a/modules/webapp/src/main/elm/Comp/ItemDetail.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemDetail.elm
@@ -1033,7 +1033,7 @@ view inav model =
                     [ ( "toggle item", True )
                     , ( "active", model.menuOpen )
                     ]
-                , title "Edit item"
+                , title "Edit Metadata"
                 , onClick ToggleMenu
                 , href ""
                 ]
@@ -1050,6 +1050,21 @@ view inav model =
                 ]
                 [ i [ class "mail outline icon" ] []
                 ]
+            , a
+                [ classList
+                    [ ( "toggle item", True )
+                    , ( "active", isEditNotes model.notesField )
+                    ]
+                , if isEditNotes model.notesField then
+                    title "Cancel editing"
+
+                  else
+                    title "Edit Notes"
+                , onClick ToggleEditNotes
+                , href "#"
+                ]
+                [ i [ class "edit outline icon" ] []
+                ]
             ]
         , renderMailForm model
         , div [ class "ui grid" ]
@@ -1137,13 +1152,6 @@ renderNotes model =
                             ]
                             [ i [ class "eye slash icon" ] []
                             ]
-                        , a
-                            [ class "ui right corner label"
-                            , onClick ToggleEditNotes
-                            , href "#"
-                            ]
-                            [ i [ class "edit icon" ] []
-                            ]
                         ]
                     ]
 
@@ -1545,16 +1553,6 @@ renderEditButtons model =
             [ i [ class "trash icon" ] []
             , text "Delete"
             ]
-        , button
-            [ classList
-                [ ( "ui secondary right floated icon button", True )
-                , ( "basic", model.notesField == HideNotes || model.notesField == ViewNotes )
-                ]
-            , title "Toggle Notes Form"
-            , onClick ToggleEditNotes
-            ]
-            [ i [ class "edit outline icon" ] []
-            ]
         ]