Merge "Update Edit Mode Buttons." into main