diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
index d59afdbd9a..1d5ee22af4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
@@ -433,7 +433,7 @@ public class NSClientPlugin extends PluginBase {
         // room  Therapy Event
         TherapyEvent therapyEvent = therapyEventFromNsIdForInvalidating(_id);
         disposable.add(repository.runTransactionForResult(new SyncTherapyEventTransaction(therapyEvent)).subscribe(
-                result -> result.getInvalidated().forEach(record -> uel.log(Action.CAREPORTAL_DELETED_FROM_NS, record.getNote() , new ValueWithUnit(record.getTimestamp(), Units.Timestamp), new ValueWithUnit(record.getType().getText(), Units.CPEvent), new ValueWithUnit(record.getGlucose(), Units.Mg_Dl), new ValueWithUnit((int) record.getDuration()/60000, Units.M))),
+                result -> result.getInvalidated().forEach(record -> uel.log(Action.CAREPORTAL_DELETED_FROM_NS, record.getNote() , new ValueWithUnit(record.getTimestamp(), Units.Timestamp), new ValueWithUnit(record.getType().getText(), Units.CPEvent))),
                 error -> aapsLogger.error(LTag.DATABASE, "Error while removing therapy event", error)));
         // new DB model
         EventNsTreatment evtTreatment = new EventNsTreatment(EventNsTreatment.Companion.getREMOVE(), json);
diff --git a/app/src/main/res/layout/treatments_user_entry_item.xml b/app/src/main/res/layout/treatments_user_entry_item.xml
index b2ce8b24c9..18e2e96e37 100644
--- a/app/src/main/res/layout/treatments_user_entry_item.xml
+++ b/app/src/main/res/layout/treatments_user_entry_item.xml
@@ -38,34 +38,24 @@
 
         </LinearLayout>
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:baselineAligned="true"
-            android:orientation="horizontal">
+        <TextView
+            android:id="@+id/values"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:paddingStart="20dp"
+            android:paddingEnd="10dp"
+            android:textStyle="bold"
+            android:visibility="gone"
+            android:text="Values with units" />
 
-            <TextView
-                android:id="@+id/values"
-                android:layout_width="0px"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="1"
-                android:paddingStart="20dp"
-                android:paddingEnd="10dp"
-                android:textStyle="bold"
-                android:visibility="gone"
-                android:text="Values with units" />
-
-            <TextView
-                android:id="@+id/s"
-                android:layout_width="0px"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.5"
-                android:paddingStart="20dp"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                tools:ignore="HardcodedText,RtlSymmetry" />
-
-        </LinearLayout>
+        <TextView
+            android:id="@+id/s"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="20dp"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            tools:ignore="HardcodedText,RtlSymmetry" />
 
         <View
             android:layout_width="fill_parent"