diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java
index 5d36e23adb..f5e85be756 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java
@@ -98,6 +98,7 @@ public class ConfigBuilderFragment extends Fragment implements PluginBase, PumpI
     ArrayList<PluginBase> pluginList;
 
     // TODO: sorting
+    // TODO: Toast and sound when command failed
 
     public ConfigBuilderFragment() {
         super();
diff --git a/app/src/main/res/layout/vitualpump_fragment.xml b/app/src/main/res/layout/vitualpump_fragment.xml
index d4643daec9..bb74270613 100644
--- a/app/src/main/res/layout/vitualpump_fragment.xml
+++ b/app/src/main/res/layout/vitualpump_fragment.xml
@@ -5,122 +5,155 @@
     tools:context=".plugins.VirtualPump.VirtualPumpFragment">
 
     <LinearLayout
-        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:text="@string/vitualpump_label"
             android:layout_gravity="center"
-            android:layout_marginTop="20dp" />
+            android:layout_marginTop="20dp"
+            android:text="@string/vitualpump_label"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
 
         <LinearLayout
-            android:orientation="horizontal"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20dp">
+            android:layout_marginTop="20dp"
+            android:orientation="horizontal">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_marginRight="15dp"
+                android:singleLine="true"
                 android:text="@string/virtualpump_basebasalrate_label"
-                android:singleLine="true"
-                android:textStyle="bold"
-                android:layout_marginRight="15dp" />
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="@color/colorPumpLabel"
+                android:textStyle="bold" />
 
             <TextView
+                android:id="@+id/virtualpump_basabasalrate"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:id="@+id/virtualpump_basabasalrate" />
+                android:layout_weight="1"
+                android:gravity="right"
+                android:paddingRight="5dp"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
+
 
         </LinearLayout>
+
         <LinearLayout
-            android:orientation="horizontal"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp">
+            android:layout_marginTop="10dp"
+            android:orientation="horizontal">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_marginRight="15dp"
+                android:singleLine="true"
                 android:text="@string/virtualpump_tempbasal_label"
-                android:singleLine="true"
-                android:textStyle="bold"
-                android:layout_marginRight="15dp" />
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="@color/colorPumpLabel"
+                android:textStyle="bold" />
 
             <TextView
+                android:id="@+id/virtualpump_tempbasal"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:id="@+id/virtualpump_tempbasal" />
+                android:layout_weight="1"
+                android:gravity="right"
+                android:paddingRight="5dp"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
+
 
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_marginTop="10dp">
+            android:layout_marginTop="10dp"
+            android:orientation="horizontal">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginRight="15dp"
                 android:singleLine="true"
                 android:text="@string/virtualpump_extendedbolus_label"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textStyle="bold"
-                android:layout_marginRight="15dp" />
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="@color/colorPumpLabel"
+                android:textStyle="bold" />
 
             <TextView
                 android:id="@+id/virtualpump_extendedbolus"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:paddingRight="5dp"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
+
 
         </LinearLayout>
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_marginTop="10dp">
+            android:layout_marginTop="10dp"
+            android:orientation="horizontal">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginRight="15dp"
                 android:singleLine="true"
                 android:text="@string/virtualpump_battery_label"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textStyle="bold"
-                android:layout_marginRight="15dp" />
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="@color/colorPumpLabel"
+                android:textStyle="bold" />
 
             <TextView
                 android:id="@+id/virtualpump_battery"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:paddingRight="5dp"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
+
 
         </LinearLayout>
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_marginTop="10dp">
+            android:layout_marginTop="10dp"
+            android:orientation="horizontal">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginRight="15dp"
                 android:singleLine="true"
                 android:text="@string/virtualpump_reservoir_label"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textStyle="bold"
-                android:layout_marginRight="15dp" />
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="@color/colorPumpLabel"
+                android:textStyle="bold" />
 
             <TextView
                 android:id="@+id/virtualpump_reservoir"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:paddingRight="5dp"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
+
 
         </LinearLayout>
     </LinearLayout>