diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail.elm b/modules/webapp/src/main/elm/Comp/ItemDetail.elm
index 57ff0a61..03fb356b 100644
--- a/modules/webapp/src/main/elm/Comp/ItemDetail.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemDetail.elm
@@ -1520,7 +1520,7 @@ renderEditMenu model =
 
 renderEditButtons : Model -> Html Msg
 renderEditButtons model =
-    div [ class "ui top attached right aligned segment" ]
+    div [ class "ui top attached segment" ]
         [ button
             [ classList
                 [ ( "ui primary button", True )
@@ -1545,6 +1545,16 @@ 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" ] []
+            ]
         ]
 
 
@@ -1632,20 +1642,6 @@ renderEditForm model =
                 , Html.map ConcEquipMsg (Comp.Dropdown.view model.concEquipModel)
                 , renderConcEquipSuggestions model
                 ]
-            , h4 [ class "ui dividing header" ]
-                [ i [ class "tiny edit icon" ] []
-                , div [ class "content" ]
-                    [ text "Notes"
-                    ]
-                ]
-            , div [ class "field" ]
-                [ div [ class "ui input" ]
-                    [ button [ class "ui basic primary fluid button", onClick ToggleEditNotes ]
-                        [ i [ class "edit outline icon" ] []
-                        , text "Toggle Notes Form"
-                        ]
-                    ]
-                ]
             ]
         ]