diff --git a/app/build.gradle b/app/build.gradle
index 1ae0cc7..bc4a365 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -82,9 +82,9 @@ android {
     defaultConfig {
         applicationId "eu.pkgsoftware.babybuddywidgets"
         minSdkVersion 24
-        targetSdkVersion 33
-        versionCode 38
-        versionName "2.3.3"
+        targetSdk 34
+        versionCode 40
+        versionName "2.4.0b"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -105,28 +105,34 @@ android {
     namespace 'eu.pkgsoftware.babybuddywidgets'
 }
 
-ext.camerax_version = "1.3.1"
+ext.camerax_version = "1.3.4"
 
 dependencies {
     implementation 'com.squareup.phrase:phrase:1.2.0'
 
+    // Retrofit and jackson need to be compatible. Maybe(?) the matching the major versions
+    // is enough, but I'm not sure. This version works.
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-jackson:2.9.0'
 
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.11.0'
+    implementation 'com.fasterxml.jackson.core:jackson-core:2.10.1'
+    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.10.1'
+    implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.9.10'
+
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
     implementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.concurrent:concurrent-futures:1.1.0'
+    implementation 'androidx.concurrent:concurrent-futures:1.2.0'
 
     implementation "androidx.camera:camera-core:$camerax_version"
     implementation "androidx.camera:camera-camera2:$camerax_version"
     implementation "androidx.camera:camera-lifecycle:$camerax_version"
     implementation "androidx.camera:camera-view:$camerax_version"
 
-    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.core:core-ktx:1.13.1'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
@@ -136,9 +142,9 @@ dependencies {
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4"
     testImplementation 'org.json:json:20230618'
 
-    androidTestImplementation 'androidx.test:core-ktx:1.5.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test:core-ktx:1.6.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
     androidTestImplementation 'tools.fastlane:screengrab:2.1.1'
 
     implementation project(':zxing-cpp')
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/ActivityStorage.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/ActivityStorage.kt
new file mode 100644
index 0000000..52ab5e7
--- /dev/null
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/ActivityStorage.kt
@@ -0,0 +1,97 @@
+package eu.pkgsoftware.babybuddywidgets
+
+import android.content.Context
+import android.database.sqlite.SQLiteDatabase
+import android.database.sqlite.SQLiteOpenHelper
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import eu.pkgsoftware.babybuddywidgets.debugging.GlobalDebugObject
+import java.io.IOException
+
+class ActivityDatabaseV1(context: Context) : SQLiteOpenHelper(
+    context, "store", null, 1
+) {
+    override fun onCreate(db: SQLiteDatabase) {
+        db.execSQL("create table global_kv (key_name text primary key, value text)")
+        db.execSQL("create table login_kv (key_name text primary key, value text)")
+        db.execSQL("create table child_kv (child INTEGER, key_name text, value text, primary key (child, key_name))")
+    }
+
+    override fun onUpgrade(db: SQLiteDatabase?, oldVersion: Int, newVersion: Int) {
+        TODO("Not yet implemented")
+    }
+}
+
+class ActivityStore(context: Context) {
+    val openHelper = ActivityDatabaseV1(context)
+    val database = openHelper.writableDatabase
+    val jackOM = jacksonObjectMapper()
+
+    inline fun <reified K> genSet(table: String, value: K?, selectors: Map<String, String>) {
+        if (value == null) {
+            val query = "delete from $table where " + selectors.keys.joinToString(" and ") { "$it = ?" }
+            val args = selectors.values.toTypedArray()
+            database.execSQL(query, args)
+        } else {
+            val query = "insert or replace into $table (" +
+                    selectors.keys.joinToString(", ") + ", value) values (" +
+                    selectors.keys.joinToString(", ") { "?" } + ", ?)"
+            val valueString = jackOM.writeValueAsString(value)
+            database.execSQL(query, selectors.values.toTypedArray() + valueString)
+        }
+    }
+
+    inline fun <reified K> genGet(table: String, selectors: Map<String, String>): K? {
+        val query = "select value from $table where " + selectors.keys.joinToString(" and ") { "$it = ?" }
+        val cursor = database.rawQuery(query, selectors.values.toTypedArray())
+        var value = ""
+        try {
+            if (cursor.moveToNext()) {
+                value = cursor.getString(0)
+                cursor.close()
+                return jackOM.readValue(value, K::class.java)
+            }
+        }
+        catch (e: IOException) {
+            GlobalDebugObject.log("Failed to deserialize value from table $table: '$value'")
+        }
+        finally {
+            cursor.close()
+        }
+        return null
+    }
+
+    inline fun <reified K> globals(key: String): K? {
+        return genGet("global_kv", mapOf("key_name" to key))
+    }
+
+    inline fun <reified K> globals(key: String, value: K) {
+        genSet("global_kv", value, mapOf("key_name" to key))
+    }
+
+    inline fun <reified K> login(key: String): K? {
+        return genGet("login_kv", mapOf("key_name" to key))
+    }
+
+    inline fun <reified K> login(key: String, value: K) {
+        genSet("login_kv", value, mapOf("key_name" to key))
+    }
+
+    inline fun <reified K> child(child: Int, key: String): K? {
+        return genGet("child_kv", mapOf("child" to child.toString(), "key_name" to key))
+    }
+
+    inline fun <reified K> child(child: Int, key: String, value: K) {
+        genSet("child_kv", value, mapOf("child" to child.toString(), "key_name" to key))
+    }
+
+    fun close() {
+        database.close()
+        openHelper.close()
+    }
+
+    fun deleteAllData() {
+        database.delete("global_kv", "1", arrayOf())
+        database.delete("login_kv", "1", arrayOf())
+        database.delete("child_kv", "1", arrayOf())
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/BabyLayoutHolder.java b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/BabyLayoutHolder.java
index 9afa879..7d86f55 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/BabyLayoutHolder.java
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/BabyLayoutHolder.java
@@ -6,50 +6,45 @@
 
 import org.jetbrains.annotations.NotNull;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import eu.pkgsoftware.babybuddywidgets.activitycomponents.TimerControl;
+import eu.pkgsoftware.babybuddywidgets.timers.FragmentCallbacks;
+import eu.pkgsoftware.babybuddywidgets.timers.LoggingButtonController;
 import eu.pkgsoftware.babybuddywidgets.databinding.BabyManagerBinding;
-import eu.pkgsoftware.babybuddywidgets.databinding.NotesEditorBinding;
 import eu.pkgsoftware.babybuddywidgets.history.ChildEventHistoryLoader;
-import eu.pkgsoftware.babybuddywidgets.history.ShowErrorPill;
 import eu.pkgsoftware.babybuddywidgets.networking.BabyBuddyClient;
 import eu.pkgsoftware.babybuddywidgets.networking.ChildrenStateTracker;
-import eu.pkgsoftware.babybuddywidgets.timers.EmptyTimerListProvider;
-import eu.pkgsoftware.babybuddywidgets.timers.StoreActivityRouter;
+import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.models.TimeEntry;
 import eu.pkgsoftware.babybuddywidgets.timers.TimerControlInterface;
-import eu.pkgsoftware.babybuddywidgets.timers.TimerListProvider;
 import eu.pkgsoftware.babybuddywidgets.timers.TimersUpdatedCallback;
 import eu.pkgsoftware.babybuddywidgets.timers.TranslatedException;
 import eu.pkgsoftware.babybuddywidgets.utils.Promise;
-import eu.pkgsoftware.babybuddywidgets.widgets.SwitchButtonLogic;
 
 public class BabyLayoutHolder extends RecyclerView.ViewHolder implements TimerControlInterface {
     private final BabyManagerBinding binding;
     private final BaseFragment baseFragment;
     private final BabyBuddyClient client;
-    private TimerListProvider timerListProvider = null;
 
-    private BabyBuddyClient.Child child = null;
 
-    private boolean changeWet = false;
-    private boolean changeSolid = false;
+    private BabyBuddyClient.Child child = null;
 
-    private NotesEditorLogic notesEditor;
-    private SwitchButtonLogic notesSwitch;
     private ChildEventHistoryLoader childHistoryLoader = null;
 
     private ChildrenStateTracker.ChildObserver childObserver = null;
-    private StoreActivityRouter storeActivityRouter;
 
     private BabyBuddyClient.Timer[] cachedTimers = null;
-    private TimersUpdatedCallback updateTimersCallback = null;
+    private List<TimersUpdatedCallback> updateTimersCallbacks = new ArrayList<>(10);
 
     private int pendingTimerModificationCalls = 0;
 
+    private LoggingButtonController loggingButtonController = null;
+
     public BabyLayoutHolder(BaseFragment fragment, BabyManagerBinding bmb) {
         super(bmb.getRoot());
         binding = bmb;
@@ -57,40 +52,6 @@ public BabyLayoutHolder(BaseFragment fragment, BabyManagerBinding bmb) {
         baseFragment = fragment;
         client = fragment.getMainActivity().getClient();
 
-        storeActivityRouter = new StoreActivityRouter(baseFragment.getMainActivity());
-
-        GridLayoutManager l = new GridLayoutManager(binding.timersList.getContext(), 1);
-        binding.timersList.setLayoutManager(l);
-
-        View.OnClickListener invertSolid = view -> {
-            changeSolid = !changeSolid;
-            updateDiaperBar();
-        };
-        binding.solidEnabledButton.setOnClickListener(invertSolid);
-        binding.solidDisabledButton.setOnClickListener(invertSolid);
-
-        View.OnClickListener invertWet = view -> {
-            changeWet = !changeWet;
-            updateDiaperBar();
-        };
-        binding.wetEnabledButton.setOnClickListener(invertWet);
-        binding.wetDisabledButton.setOnClickListener(invertWet);
-        binding.sendChangeButton.setOnClickListener(view -> storeDiaperChange());
-
-        notesSwitch = new SwitchButtonLogic(
-            binding.addNoteButton,
-            binding.removeNoteButton,
-            false
-        );
-
-        NotesEditorBinding notesEditorBinding = NotesEditorBinding.inflate(
-            fragment.getMainActivity().getLayoutInflater()
-        );
-        binding.diaperNotesSlot.addView(notesEditorBinding.getRoot());
-
-        notesEditor = new NotesEditorLogic(notesEditorBinding, false);
-        notesSwitch.addStateListener((b, userInduced) -> notesEditor.setVisible(b));
-
         binding.mainScrollView.setOnScrollChangeListener((v, scrollX, scrollY, oldScrollX, oldScrollY) -> {
             if (childHistoryLoader != null) {
                 childHistoryLoader.updateTop();
@@ -102,46 +63,6 @@ public BabyBuddyClient.Child getChild() {
         return child;
     }
 
-    private void resetDiaperUi() {
-        changeSolid = false;
-        changeWet = false;
-        updateDiaperBar();
-    }
-
-    private void updateDiaperBar() {
-        binding.sendChangeButton.setVisibility((changeSolid || changeWet) ? View.VISIBLE : View.INVISIBLE);
-        binding.solidEnabledButton.setVisibility(changeSolid ? View.VISIBLE : View.GONE);
-        binding.solidDisabledButton.setVisibility(!changeSolid ? View.VISIBLE : View.GONE);
-        binding.wetEnabledButton.setVisibility(changeWet ? View.VISIBLE : View.GONE);
-        binding.wetDisabledButton.setVisibility(!changeWet ? View.VISIBLE : View.GONE);
-    }
-
-    private void storeDiaperChange() {
-        client.createChangeRecord(child, changeWet, changeSolid, notesEditor.getText(),
-            new BabyBuddyClient.RequestCallback<Boolean>() {
-                @Override
-                public void error(@NonNull Exception error) {
-                    baseFragment.showError(
-                        true,
-                        "Failed to save",
-                        "Diaper change not saved"
-                    );
-                }
-
-                @Override
-                public void response(Boolean response) {
-                    notesEditor.clearText();
-                    notesSwitch.setState(false);
-                    if (childHistoryLoader != null) {
-                        childHistoryLoader.forceRefresh();
-                    }
-                }
-            }
-        );
-
-        resetDiaperUi();
-    }
-
     private void requeueImmediateTimerListRefresh() {
         client.listTimers(child.id, new BabyBuddyClient.RequestCallback<BabyBuddyClient.Timer[]>() {
             @Override
@@ -160,16 +81,15 @@ private void resetChildHistoryLoader() {
             childHistoryLoader.close();
         }
         childHistoryLoader = null;
-        binding.timersList.setAdapter(new EmptyTimerListProvider());
     }
 
     public void updateChild(BabyBuddyClient.Child c, ChildrenStateTracker stateTracker) {
+        if (childObserver != null && child == c && stateTracker == childObserver.getTracker()) {
+            return;
+        }
+
         clear();
         this.child = c;
-        notesEditor.setNotes(new CredStoreNotes(
-            "diaper_" + c.slug, baseFragment.getMainActivity().getCredStore()
-        ));
-        notesSwitch.setState(notesEditor.isVisible());
 
         if (child != null) {
             if (stateTracker == null) {
@@ -194,8 +114,40 @@ public void updateChild(BabyBuddyClient.Child c, ChildrenStateTracker stateTrack
                 }
 
             );
-            timerListProvider = new TimerListProvider(baseFragment, this);
-            binding.timersList.setAdapter(timerListProvider);
+
+            loggingButtonController = new LoggingButtonController(
+                baseFragment,
+                binding,
+                new FragmentCallbacks() {
+                    @Override
+                    public void insertControls(@NonNull View view) {
+                        if (view.getParent() != null) {
+                            return;
+                        }
+                        binding.loggingEditors.addView(view);
+                    }
+
+                    @Override
+                    public void removeControls(@NonNull View view) {
+                        if (view.getParent() == null) {
+                            return;
+                        }
+                        binding.loggingEditors.removeView(view);
+                    }
+
+                    @Override
+                    public void updateTimeline(@Nullable TimeEntry newEntry) {
+                        if (childHistoryLoader != null) {
+                            if (newEntry != null) {
+                                childHistoryLoader.addEntryToTop(newEntry);
+                            }
+                            childHistoryLoader.forceRefresh();
+                        }
+                    }
+                },
+                child,
+                this
+            );
         }
     }
 
@@ -223,9 +175,11 @@ public void updateTimerList(BabyBuddyClient.Timer[] timers) {
     }
 
     public void onViewDeselected() {
+        if (loggingButtonController != null) {
+            loggingButtonController.storeStateForSuspend();
+        }
         resetChildObserver();
         resetChildHistoryLoader();
-        resetDiaperUi();
     }
 
     private void resetChildObserver() {
@@ -236,16 +190,19 @@ private void resetChildObserver() {
     }
 
     public void clear() {
+        if (loggingButtonController != null) {
+            loggingButtonController.storeStateForSuspend();
+            loggingButtonController.destroy();
+            loggingButtonController = null;
+        }
         resetChildObserver();
         resetChildHistoryLoader();
-        resetDiaperUi();
         child = null;
         cachedTimers = null;
     }
 
     public void close() {
         clear();
-        timerListProvider.close();
     }
 
     private class UpdateBufferingPromise<A, B> implements Promise<A, B> {
@@ -291,32 +248,28 @@ public void stopTimer(@NotNull BabyBuddyClient.Timer timer, @NonNull Promise<Obj
     }
 
     @Override
-    public void storeActivity(
-        @NotNull BabyBuddyClient.Timer timer,
-        @NonNull String activity,
-        @NonNull String notes,
-        @NonNull Promise<Boolean, Exception> cb
-    ) {
-        baseFragment.getMainActivity().getChildTimerControl(child).storeActivity(
-            timer,
-            activity,
-            notes,
-            new UpdateBufferingPromise<>(cb) {
-                @Override
-                public void succeeded(Boolean aBoolean) {
-                    super.succeeded(aBoolean);
-                    if (childHistoryLoader != null) {
-                        childHistoryLoader.forceRefresh();
-                    }
+    public void registerTimersUpdatedCallback(@NonNull TimersUpdatedCallback callback) {
+        if (updateTimersCallbacks.contains(callback)) {
+            return;
+        }
+        updateTimersCallbacks.add(callback);
+
+        baseFragment.getMainActivity().getChildTimerControl(child).registerTimersUpdatedCallback(
+            timers -> {
+                for (TimersUpdatedCallback c : updateTimersCallbacks) {
+                    c.newTimerListLoaded(timers);
                 }
             }
         );
+        callTimerUpdateCallback();
     }
 
     @Override
-    public void registerTimersUpdatedCallback(@NonNull TimersUpdatedCallback callback) {
-        baseFragment.getMainActivity().getChildTimerControl(child).registerTimersUpdatedCallback(callback);
-        callTimerUpdateCallback();
+    public void unregisterTimersUpdatedCallback(@NonNull TimersUpdatedCallback callback) {
+        if (!updateTimersCallbacks.contains(callback)) {
+            return;
+        }
+        updateTimersCallbacks.remove(callback);
     }
 
     private void callTimerUpdateCallback() {
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/CredStore.java b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/CredStore.java
index 62588f1..d2baeb5 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/CredStore.java
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/CredStore.java
@@ -319,7 +319,7 @@ public boolean isStoredVersionOutdated() {
         return !CURRENT_VERSION.equals(storedVersion);
     }
 
-    public Map<String, String> getAuthCookies() {
+    public @NotNull Map<String, String> getAuthCookies() {
         String encodedMap = decryptMessage(encryptedCookies);
         if (encodedMap == null) {
             return new HashMap<>();
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/FeedingFragment.java b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/FeedingFragment.java
deleted file mode 100644
index 7640585..0000000
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/FeedingFragment.java
+++ /dev/null
@@ -1,481 +0,0 @@
-package eu.pkgsoftware.babybuddywidgets;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.Spinner;
-
-import com.squareup.phrase.Phrase;
-
-import org.jetbrains.annotations.NotNull;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.text.DecimalFormat;
-import java.text.NumberFormat;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.List;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.navigation.NavController;
-import androidx.navigation.Navigation;
-import eu.pkgsoftware.babybuddywidgets.activitycomponents.TimerControl;
-import eu.pkgsoftware.babybuddywidgets.compat.BabyBuddyV2TimerAdapter;
-import eu.pkgsoftware.babybuddywidgets.databinding.FeedingFragmentBinding;
-import eu.pkgsoftware.babybuddywidgets.databinding.NotesEditorBinding;
-import eu.pkgsoftware.babybuddywidgets.networking.BabyBuddyClient;
-import eu.pkgsoftware.babybuddywidgets.networking.RequestCodeFailure;
-import eu.pkgsoftware.babybuddywidgets.timers.ResolveConflicts;
-import eu.pkgsoftware.babybuddywidgets.timers.TimerControlInterface;
-import eu.pkgsoftware.babybuddywidgets.timers.TranslatedException;
-import eu.pkgsoftware.babybuddywidgets.utils.Promise;
-import eu.pkgsoftware.babybuddywidgets.widgets.HorizontalNumberPicker;
-
-public class FeedingFragment extends BaseFragment {
-    public interface ButtonListCallback {
-        void onSelectionChanged(int i);
-    }
-
-    public class AmountValuesGenerator implements HorizontalNumberPicker.ValueGenerator {
-        public static final NumberFormat FORMAT_VALUE = DecimalFormat.getNumberInstance();
-
-        public long minValue() {
-            return -1L;
-        }
-
-        public long maxValue() {
-            return 1 + 5 * 9;
-        } // 5 orders of magnitude
-
-        private long calcBaseValue(long index) {
-            return (long) Math.round(Math.pow(10, (double) Math.max(0, (index / 9))));
-        }
-
-        public String getValue(long index) {
-            if (index < 0) {
-                return getString(R.string.store_feeding_amount_none);
-            } else {
-                return FORMAT_VALUE.format(getRawValue(index, 0f));
-            }
-        }
-
-        public Double getRawValue(long index, float offset) {
-            if (index + offset < -0.001) {
-                return null;
-            } else {
-                if (offset < 0) {
-                    index--;
-                    offset += 1.0f;
-                    if (index < 0) {
-                        index = 0;
-                        offset = 0.0f;
-                    }
-                }
-
-                if (index == 0) {
-                    return (double) offset;
-                }
-                return (double) calcBaseValue(index - 1) * (((index - 1) % 9 + 1) + offset);
-            }
-        }
-
-        public long getValueIndex(Double value) {
-            if (value == null) {
-                return -1L;
-            } else {
-                long exp = (long) Math.max(0, Math.floor(Math.log10(value)));
-                long base10 = Math.round(Math.pow(10, exp));
-                double relativeRest = value / base10;
-
-                long index = (long) Math.floor(relativeRest);
-                double offset = relativeRest - index;
-                if (offset >= 0.5) {
-                    offset -= 1.0;
-                    index += 1;
-                }
-                index += 9 * exp;
-
-                return Math.max(minValue(), Math.min(maxValue(), index));
-            }
-        }
-
-        public double getValueOffset(Double value) {
-            if (value == null) {
-                return 0.0d;
-            } else {
-                long exp = (long) Math.max(0, Math.floor(Math.log10(value)));
-                long base10 = Math.round(Math.pow(10, exp));
-                double relativeRest = value / base10;
-
-                long index = (long) Math.floor(relativeRest);
-                double offset = relativeRest - index;
-                if (offset >= 0.5) {
-                    offset -= 1.0;
-                    index += 1;
-                }
-                index += 9 * exp;
-
-                return Math.max(-0.5, Math.min(0.5, offset));
-            }
-        }
-    }
-
-    private FeedingFragmentBinding binding = null;
-    private Double amount = -1.0;
-    private NotesEditorBinding notesEditor = null;
-    private AmountValuesGenerator amountValuesGenerator = new AmountValuesGenerator();
-    private BabyBuddyClient.Timer selectedTimer = null;
-    private BabyBuddyClient.Timer virtTimer = null;
-    private boolean restoredPreviousState = false;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        binding = FeedingFragmentBinding.inflate(inflater, container, false);
-        View view = binding.getRoot();
-
-        binding.submitButton.setOnClickListener(view1 -> submitFeeding());
-        binding.feedingTypeSpinner.setOnItemSelectedListener(
-            new AdapterView.OnItemSelectedListener() {
-                @Override
-                public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
-                    setupFeedingMethodButtons(Constants.FeedingTypeEnumValues.get((int) l));
-                }
-
-                @Override
-                public void onNothingSelected(AdapterView<?> adapterView) {
-                }
-            }
-        );
-
-        binding.amountNumberPicker.setValueGenerator(amountValuesGenerator);
-        binding.amountNumberPicker.setValueUpdatedListener(
-            new HorizontalNumberPicker.ValueUpdatedListener() {
-                @Override
-                public void valueChangeChanging(long valueIndex, float relativeOffset) {
-                    amount = amountValuesGenerator.getRawValue(valueIndex, relativeOffset);
-                    updateAmount();
-                }
-
-                @Override
-                public void valueChangeFinished(long valueIndex, float relativeOffset) {
-                    valueChangeChanging(valueIndex, relativeOffset);
-                }
-            }
-        );
-
-        notesEditor = NotesEditorBinding.inflate(mainActivity().getLayoutInflater());
-        binding.notes.addView(notesEditor.getRoot());
-
-        String notes = "";
-        final Bundle args = getArguments();
-        if (args != null) {
-            notes = args.getString("notes", "");
-        }
-        notesEditor.noteEditor.setText(notes);
-
-        resetVisibilityState();
-
-        return view;
-    }
-
-    @Override
-    public void onViewStateRestored(@Nullable Bundle savedInstanceState) {
-        super.onViewStateRestored(savedInstanceState);
-
-        restoredPreviousState = savedInstanceState != null;
-        if (restoredPreviousState) {
-            final String timerIdString = savedInstanceState.getString("timerId", null);
-            if (timerIdString != null) {
-                try {
-                    selectedTimer = BabyBuddyClient.Timer.fromJSON(new JSONObject(timerIdString));
-                    virtTimer = timerControl().timerToVirtualTimer(
-                        selectedTimer
-                    );
-                } catch (ParseException | JSONException e) {
-                    selectedTimer = null;
-                    virtTimer = null;
-                    System.err.println("Could not decode selected timer data");
-                }
-            }
-            amount = savedInstanceState.getDouble("amount", -1.0);
-            final String notes = savedInstanceState.getString("notes");
-            notesEditor.noteEditor.setText(notes);
-        }
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-
-        if (!restoredPreviousState) {
-            Double lastUsedAmount = mainActivity().getCredStore().getLastUsedAmount();
-            if (lastUsedAmount != null) {
-                amount = lastUsedAmount;
-            }
-        }
-
-        if (amount == null) {
-            amount = -1.0;
-        }
-        final double newAmountValue = amount;
-        binding.amountNumberPicker.setValueIndex(amountValuesGenerator.getValueIndex(newAmountValue));
-        binding.amountNumberPicker.setRelativeValueIndexOffset(amountValuesGenerator.getValueOffset(newAmountValue));
-
-        resetVisibilityState();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        if (!restoredPreviousState) {
-            if (mainActivity().selectedTimer != null) {
-                selectedTimer = mainActivity().selectedTimer;
-                virtTimer = timerControl().timerToVirtualTimer(
-                    selectedTimer
-                );
-            }
-        }
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-
-        if (selectedTimer != null) {
-            CredStore.Notes notes = timerControl().getNotes(virtTimer);
-            notes.note = notesEditor.noteEditor.getText().toString();
-            timerControl().setNotes(virtTimer, notes);
-            mainActivity().getCredStore().storePrefs();
-        }
-    }
-
-    @Override
-    public void onSaveInstanceState(@NonNull Bundle outState) {
-        if (selectedTimer == null) {
-            outState.putString("timerId", null);
-        } else {
-            outState.putString("timerId", selectedTimer.toJSON().toString());
-        }
-        if (amount == null) {
-            outState.putDouble("amount", -1.0);
-        } else {
-            outState.putDouble("amount", amount);
-        }
-        outState.putString("notes", notesEditor.noteEditor.getText().toString());
-    }
-
-    private void resetVisibilityState() {
-        populateButtonList(
-            getResources().getTextArray(R.array.feedingTypes),
-            binding.feedingTypeButtons,
-            binding.feedingTypeSpinner,
-            i -> setupFeedingMethodButtons(Constants.FeedingTypeEnumValues.get(i))
-        );
-        binding.feedingMethodSpinner.setVisibility(View.GONE);
-        binding.feedingMethodButtons.setVisibility(View.GONE);
-        updateAmount();
-    }
-
-    private void updateAmount() {
-        String text = "(" + getString(R.string.store_feeding_amount_none) + ")";
-        if (amount != null) {
-            text = AmountValuesGenerator.FORMAT_VALUE.format(amount);
-        }
-        binding.amountText.setText(
-            Phrase.from(requireContext(), R.string.store_feeding_amount_string)
-                .put("quantity", text)
-                .format()
-        );
-    }
-
-    private static class ButtonListOnClickListener implements View.OnClickListener {
-        private int i;
-        private ButtonListCallback cb;
-
-        public ButtonListOnClickListener(ButtonListCallback cb, int i) {
-            this.i = i;
-            this.cb = cb;
-        }
-
-        public void onClick(View view) {
-            cb.onSelectionChanged(i);
-        }
-    }
-
-    private void populateButtonList(CharSequence[] textArray, LinearLayout buttons, Spinner spinner, ButtonListCallback callback) {
-        spinner.setVisibility(View.GONE);
-        buttons.setVisibility(View.VISIBLE);
-
-        buttons.removeAllViewsInLayout();
-        for (int i = 0; i < textArray.length; i++) {
-            Button button = new Button(getContext());
-            button.setOnClickListener(
-                new ButtonListOnClickListener(
-                    i0 -> {
-                        spinner.setSelection(i0);
-                        spinner.setVisibility(View.VISIBLE);
-                        buttons.setVisibility(View.GONE);
-                        callback.onSelectionChanged(i0);
-                    }, i)
-            );
-            button.setText(textArray[i]);
-            button.setLayoutParams(
-                new LinearLayout.LayoutParams(
-                    LinearLayout.LayoutParams.WRAP_CONTENT,
-                    LinearLayout.LayoutParams.WRAP_CONTENT,
-                    1));
-            buttons.addView(button);
-        }
-    }
-
-    private List<Constants.FeedingMethodEnum> assignedMethodButtons = null;
-
-    private void setupFeedingMethodButtons(Constants.FeedingTypeEnum type) {
-        binding.submitButton.setVisibility(View.GONE);
-        assignedMethodButtons = new ArrayList<>(10);
-
-        switch (type) {
-            case BREAST_MILK:
-                assignedMethodButtons.add(Constants.FeedingMethodEnum.LEFT_BREAST);
-                assignedMethodButtons.add(Constants.FeedingMethodEnum.RIGHT_BREAST);
-                assignedMethodButtons.add(Constants.FeedingMethodEnum.BOTH_BREASTS);
-                assignedMethodButtons.add(Constants.FeedingMethodEnum.BOTTLE);
-                assignedMethodButtons.add(Constants.FeedingMethodEnum.PARENT_FED);
-                assignedMethodButtons.add(Constants.FeedingMethodEnum.SELF_FED);
-                break;
-            default:
-                assignedMethodButtons.add(Constants.FeedingMethodEnum.BOTTLE);
-                assignedMethodButtons.add(Constants.FeedingMethodEnum.PARENT_FED);
-                assignedMethodButtons.add(Constants.FeedingMethodEnum.SELF_FED);
-        }
-
-        CharSequence[] orgItems = getResources().getTextArray(R.array.feedingMethods);
-        List<CharSequence> textItems = new ArrayList<>(10);
-        for (int i = 0; i < assignedMethodButtons.size(); i++) {
-            textItems.add(orgItems[assignedMethodButtons.get(i).value]);
-        }
-
-        binding.feedingMethodSpinner.setAdapter(
-            new ArrayAdapter<CharSequence>(
-                requireContext(), android.R.layout.simple_spinner_dropdown_item, textItems
-            )
-        );
-
-        populateButtonList(
-            textItems.toArray(
-                new CharSequence[0]),
-            binding.feedingMethodButtons,
-            binding.feedingMethodSpinner,
-            i -> binding.submitButton.setVisibility(View.VISIBLE)
-        );
-    }
-
-    private MainActivity mainActivity() {
-        return (MainActivity) getActivity();
-    }
-
-    private BabyBuddyV2TimerAdapter timerControl() {
-        return mainActivity().getChildTimerControl(selectedTimer.child_id);
-    }
-
-    private void submitFeeding() {
-        long feedingTypeId = binding.feedingTypeSpinner.getSelectedItemId();
-        Constants.FeedingTypeEnum feedingType = Constants.FeedingTypeEnumValues.get((int) feedingTypeId);
-        long feedingMethodId = binding.feedingMethodSpinner.getSelectedItemId();
-        Constants.FeedingMethodEnum feedingMethod = assignedMethodButtons.get((int) feedingMethodId);
-
-        Float fAmount = amount == null ? null : (float) (amount * 1.0d);
-        if (fAmount != null) {
-            fAmount = Math.round(fAmount * 10.0f) / 10.0f;
-        }
-        final Float finalFloatAmount = fAmount;
-
-        mainActivity().storeActivity(selectedTimer, new StoreFunction<Boolean>() {
-            @Override
-            public void error(@NonNull Exception error) {
-                ResolveConflicts resolveConflicts = new ResolveConflicts(
-                    FeedingFragment.this, virtTimer, timerControl()
-                ) {
-                    @Override
-                    protected void updateTimerActiveState() {
-                    }
-
-                    @Override
-                    protected void finished() {
-                        navUp();
-                    }
-                };
-                resolveConflicts.tryResolveStoreError(error);
-            }
-
-            @Override
-            public void response(Boolean response) {
-                MainActivity ma = mainActivity();
-                ma.getCredStore().storeLastUsedAmount(amount);
-                notesEditor.noteEditor.setText("");
-
-                timerControl().setNotes(virtTimer, CredStore.EMPTY_NOTES);
-                navUp();
-            }
-
-            @Override
-            public void cancel() {
-                navUp();
-            }
-
-            @Override
-            public void timerStopped() {
-                timerControl().stopTimer(virtTimer, new Promise<>() {
-                    @Override
-                    public void succeeded(Object o) {
-                        navUp();
-                    }
-
-                    @Override
-                    public void failed(TranslatedException s) {
-                        showError(
-                            true,
-                            R.string.activity_store_failure_failed_to_stop_title,
-                            R.string.activity_store_failure_failed_to_stop_message
-                        );
-                        navUp();
-                    }
-                });
-            }
-
-            @NonNull
-            @Override
-            public String name() {
-                return BabyBuddyClient.ACTIVITIES.FEEDING;
-            }
-
-            @Override
-            public void store(
-                @NonNull BabyBuddyClient.Timer timer,
-                @NonNull BabyBuddyClient.RequestCallback<Boolean> callback
-            ) {
-                mainActivity().getClient().createFeedingRecordFromTimer(
-                    selectedTimer,
-                    feedingType.post_name,
-                    feedingMethod.post_name,
-                    finalFloatAmount,
-                    notesEditor.noteEditor.getText().toString().trim(),
-                    callback
-                );
-            }
-        });
-    }
-
-    private void navUp() {
-        NavController nav = Navigation.findNavController(requireView());
-        nav.navigateUp();
-    }
-}
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/JacksonSerializers.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/JacksonSerializers.kt
new file mode 100644
index 0000000..e85dae9
--- /dev/null
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/JacksonSerializers.kt
@@ -0,0 +1,57 @@
+package eu.pkgsoftware.babybuddywidgets
+
+import com.fasterxml.jackson.core.JsonGenerator
+import com.fasterxml.jackson.core.JsonParser
+import com.fasterxml.jackson.databind.DeserializationContext
+import com.fasterxml.jackson.databind.SerializerProvider
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer
+import com.fasterxml.jackson.databind.ser.std.StdSerializer
+import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.DATE_ONLY_FORMAT_STRING
+import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.DATE_TIME_FORMAT_STRING
+import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.formatDate
+import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.parseNullOrDate
+import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.serverTimeToClientTime
+import java.io.IOException
+import java.util.Date
+
+class DateTimeDeserializer : StdDeserializer<Date>(Date::class.java) {
+    override fun deserialize(p: JsonParser, ctxt: DeserializationContext?): Date {
+        p.text?.let {
+            parseNullOrDate(it, DATE_TIME_FORMAT_STRING)?.let {
+                return serverTimeToClientTime(it)
+            }
+        }
+        throw IOException("Invalid date string ${p.text}")
+    }
+}
+
+class DateOnlyDeserializer : StdDeserializer<Date>(Date::class.java) {
+    override fun deserialize(p: JsonParser, ctxt: DeserializationContext?): Date {
+        p.text?.let {
+            parseNullOrDate(it, DATE_ONLY_FORMAT_STRING)?.let {
+                return it
+            }
+        }
+        throw IOException("Invalid date string ${p.text}")
+    }
+}
+
+class AnyDateTimeDeserializer : StdDeserializer<Date>(Date::class.java) {
+    override fun deserialize(p: JsonParser, ctxt: DeserializationContext?): Date {
+        p.text?.let {
+            parseNullOrDate(it, DATE_TIME_FORMAT_STRING)?.let {
+                return serverTimeToClientTime(it)
+            }
+            parseNullOrDate(it, DATE_ONLY_FORMAT_STRING)?.let {
+                return it
+            }
+        }
+        throw IOException("Invalid date string ${p.text}")
+    }
+}
+
+class DateTimeSerializer : StdSerializer<Date>(Date::class.java) {
+    override fun serialize(value: Date, gen: JsonGenerator, provider: SerializerProvider) {
+        gen.writeString(formatDate(value, DATE_TIME_FORMAT_STRING))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/MainActivity.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/MainActivity.kt
index d6db0cf..a51ddf8 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/MainActivity.kt
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/MainActivity.kt
@@ -29,11 +29,10 @@ import kotlin.coroutines.suspendCoroutine
 interface StoreFunction<X> : BabyBuddyClient.RequestCallback<X> {
     fun store(timer: BabyBuddyClient.Timer, callback: BabyBuddyClient.RequestCallback<X>)
     fun name(): String
-    fun timerStopped()
+    fun stopTimer(timer: BabyBuddyClient.Timer)
     fun cancel()
 }
 
-
 enum class ConflictResolutionOptions {
     CANCEL, RESOLVE, STOP_TIMER
 }
@@ -50,6 +49,20 @@ class MainActivity : AppCompatActivity() {
     val scope = MainScope()
     val inputEventListeners = mutableListOf<InputEventListener>()
 
+    internal var internalStorage: ActivityStore? = null
+    val storage: ActivityStore
+        get() {
+            internalStorage.let {
+                if (it == null) {
+                    val newStorage = ActivityStore(this)
+                    internalStorage = newStorage
+                    return newStorage
+                } else {
+                    return it
+                }
+            }
+        }
+
     internal var internalCredStore: CredStore? = null
     val credStore: CredStore
         get() {
@@ -171,11 +184,11 @@ class MainActivity : AppCompatActivity() {
         return super.dispatchTouchEvent(ev)
     }
 
-    override fun dispatchKeyEvent(ev: KeyEvent?): Boolean {
-        ev?.let {
+    override fun dispatchKeyEvent(event: KeyEvent): Boolean {
+        event?.let {
             invokeInputEventListeners(it)
         }
-        return super.dispatchKeyEvent(ev)
+        return super.dispatchKeyEvent(event)
     }
 
     fun <X> storeActivity(
@@ -249,7 +262,11 @@ class MainActivity : AppCompatActivity() {
             val endTime = timer.computeCurrentServerEndTime(client)
             for (c in conflicts) {
                 val values = BabyBuddyClient.QueryValues()
-                values.add("start", timer.start)
+                if (c.start < timer.start) {
+                    values.add("start", c.start)
+                } else {
+                    values.add("start", timer.start)
+                }
                 values.add("end", timer.start)
                 try {
                     patchEntry(c, values)
@@ -301,7 +318,7 @@ class MainActivity : AppCompatActivity() {
                 progressDialog.show()
                 if (resolution == ConflictResolutionOptions.STOP_TIMER) {
                     progressDialog.cancel()
-                    storeInterface.timerStopped()
+                    storeInterface.stopTimer(timer)
                 } else if (resolution == ConflictResolutionOptions.RESOLVE) {
                     var retries = 3
                     while (retries > 0) {
@@ -322,7 +339,6 @@ class MainActivity : AppCompatActivity() {
                     storeInterface.cancel()
                 }
             } catch (e: Exception) {
-                e.printStackTrace()
                 storeInterface.error(e)
             } finally {
                 progressDialog.cancel()
@@ -352,6 +368,10 @@ class MainActivity : AppCompatActivity() {
 
     fun logout() {
         credStore.clearLoginData()
+        timerControls.clear()
         internalClient = null
+        // Storage gets cleaned in the resume function of the login fragment
+        // because otherwise the cleanup functions of the LoggedIn fragment
+        // will repopulate the storage with the old data that should be deleted
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/activitycomponents/TimerControl.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/activitycomponents/TimerControl.kt
index 437d50d..099c308 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/activitycomponents/TimerControl.kt
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/activitycomponents/TimerControl.kt
@@ -5,14 +5,12 @@ import eu.pkgsoftware.babybuddywidgets.MainActivity
 import eu.pkgsoftware.babybuddywidgets.R
 import eu.pkgsoftware.babybuddywidgets.networking.BabyBuddyClient.RequestCallback
 import eu.pkgsoftware.babybuddywidgets.networking.BabyBuddyClient.Timer
-import eu.pkgsoftware.babybuddywidgets.timers.StoreActivityRouter
 import eu.pkgsoftware.babybuddywidgets.timers.TimerControlInterface
 import eu.pkgsoftware.babybuddywidgets.timers.TimersUpdatedCallback
 import eu.pkgsoftware.babybuddywidgets.timers.TranslatedException
 import eu.pkgsoftware.babybuddywidgets.utils.Promise
 
 class TimerControl(val mainActivity: MainActivity, val childId: Int) : TimerControlInterface {
-    private val storeActivityRouter = StoreActivityRouter(mainActivity)
     private val client = mainActivity.client
 
     var updateTimersCallback: TimersUpdatedCallback? = null
@@ -72,27 +70,16 @@ class TimerControl(val mainActivity: MainActivity, val childId: Int) : TimerCont
         })
     }
 
-    override fun storeActivity(
-        timer: Timer,
-        activity: String,
-        notes: String,
-        cb: Promise<Boolean, Exception>
-    ) {
-        storeActivityRouter.store(activity, notes, timer, object : Promise<Boolean, Exception> {
-            override fun succeeded(aBoolean: Boolean) {
-                cb.succeeded(aBoolean)
-            }
-
-            override fun failed(e: Exception) {
-                cb.failed(e)
-            }
-        })
-    }
-
     override fun registerTimersUpdatedCallback(callback: TimersUpdatedCallback) {
         updateTimersCallback = callback
     }
 
+    override fun unregisterTimersUpdatedCallback(callback: TimersUpdatedCallback) {
+        if (updateTimersCallback == callback) {
+            updateTimersCallback = null
+        }
+    }
+
     override fun getNotes(timer: Timer): CredStore.Notes {
         val credStore: CredStore = mainActivity.credStore
         return credStore.getObjectNotes("timer_" + timer.id)
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/compat/BabyBuddyV2TimerAdapter.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/compat/BabyBuddyV2TimerAdapter.kt
index 11d5b42..af2b515 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/compat/BabyBuddyV2TimerAdapter.kt
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/compat/BabyBuddyV2TimerAdapter.kt
@@ -15,7 +15,9 @@ import java.util.Locale
 data class WrappedTimer(val mappedActivityIndex: Int, val timer: Timer) {
 }
 
-val IMPLEMENTED_ACTIVITIES = listOf(ACTIVITIES.FEEDING, ACTIVITIES.SLEEP, ACTIVITIES.TUMMY_TIME)
+val IMPLEMENTED_ACTIVITIES = listOf(
+    ACTIVITIES.FEEDING, ACTIVITIES.SLEEP, ACTIVITIES.TUMMY_TIME, ACTIVITIES.PUMPING
+)
 
 class BabyBuddyV2TimerAdapter(
     val childId: Int,
@@ -236,24 +238,17 @@ class BabyBuddyV2TimerAdapter(
         }
     }
 
-    override fun storeActivity(
-        timer: Timer,
-        activity: String,
-        notes: String,
-        cb: Promise<Boolean, Exception>
-    ) {
-        virtualToActualTimer(timer)?.let {
-            wrap.storeActivity(it, activity, notes, cb)
-        } ?: {
-            cb.failed(java.lang.Exception("Timer ${timer.name} does not exist"))
-        }
-    }
-
     override fun registerTimersUpdatedCallback(callback: TimersUpdatedCallback) {
         timersCallback = callback
         triggerTimerCallback()
     }
 
+    override fun unregisterTimersUpdatedCallback(callback: TimersUpdatedCallback) {
+        if (timersCallback == callback) {
+            timersCallback = null
+        }
+    }
+
     override fun getNotes(timer: Timer): CredStore.Notes {
         virtualToActualTimer(timer)?.let {
             return wrap.getNotes(it)
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/debugging/GlobalDebugObject.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/debugging/GlobalDebugObject.kt
index 7ba0f14..4ed31cd 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/debugging/GlobalDebugObject.kt
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/debugging/GlobalDebugObject.kt
@@ -5,7 +5,7 @@ import android.util.Log
 class GlobalDebugObject {
     companion object {
         @JvmStatic
-        val ENABLED = false
+        val ENABLED = true
         @JvmStatic
         val DO_PRINT = true
         @JvmStatic
@@ -38,4 +38,4 @@ class GlobalDebugObject {
             return result
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/history/ChildEventHistoryLoader.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/history/ChildEventHistoryLoader.kt
index b48e1db..d9252f6 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/history/ChildEventHistoryLoader.kt
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/history/ChildEventHistoryLoader.kt
@@ -14,6 +14,7 @@ import eu.pkgsoftware.babybuddywidgets.logic.EndAwareContinuousListIntegrator
 import eu.pkgsoftware.babybuddywidgets.networking.RequestCodeFailure
 import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.ConnectingDialogInterface
 import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.InterruptedException
+import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.PaginatedResult
 import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.exponentialBackoff
 import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.models.ChangeEntry
 import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.models.SleepEntry
@@ -49,7 +50,7 @@ class ChildEventHistoryLoader(
     private val progressBar: ProgressBar,
     private val errorPill: ShowErrorPill,
 ) {
-    val HISTORY_ITEM_COUNT = 50
+    val HISTORY_ITEM_COUNT = 150 / IMPLEMENTED_EVENT_CLASSES.size
     val POLL_INTERVAL = 5000
 
     private val activityCollectionGate = IMPLEMENTED_EVENT_CLASSES.toMutableList()
@@ -97,8 +98,12 @@ class ChildEventHistoryLoader(
                         val activityName = classActivityName(it)
                         try {
                             val conInterface = BackoffConnectionInterface(activityName)
+                            val mainActivity = fragment.mainActivity
                             val r = exponentialBackoff(conInterface) {
-                                fragment.mainActivity.client.v2client.getEntries(
+                                if (fragment.isDetached) {
+                                    throw InterruptedException()
+                                }
+                                mainActivity.client.v2client.getEntries(
                                     it,
                                     offset = queryOffsets.getOrDefault(it, 0),
                                     limit = HISTORY_ITEM_COUNT,
@@ -140,7 +145,7 @@ class ChildEventHistoryLoader(
     private fun timeEntryToContinuousListItem(e: TimeEntry): ContinuousListItem {
         val result = ContinuousListItem(
             -e.start.time,
-            e.type,
+            e.appType,
             e.id.toString(),
         )
         timeEntryLookup[result] = e
@@ -246,7 +251,6 @@ class ChildEventHistoryLoader(
                     override val position: PointF? get() {
                         val r = Rect()
                         container.getGlobalVisibleRect(r)
-                        println(r)
                         if (r.isEmpty) return null
                         return PointF((r.left + r.right) / 2f, r.top.toFloat())
                     }
@@ -267,6 +271,21 @@ class ChildEventHistoryLoader(
         tutorialMessageAdded = false
     }
 
+    fun addEntryToTop(entry: TimeEntry) {
+        val cls = entry::class
+        val activityName = classActivityName(cls)
+
+        val currentList = listIntegrator.items.filter { it.className == activityName }.toMutableList()
+        currentList.add(0, timeEntryToContinuousListItem(entry))
+
+        listIntegrator.updateItemsWithCount(
+            0, currentList.size, activityName, currentList.toTypedArray()
+        )
+        fragment.mainActivity.scope.launch {
+            deferredUpdate()
+        }
+    }
+
     fun updateTop() {
         var i = 0
         listIntegrator.top = null
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/history/TimelineEntry.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/history/TimelineEntry.kt
index 1108cb3..0f98c73 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/history/TimelineEntry.kt
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/history/TimelineEntry.kt
@@ -2,7 +2,6 @@ package eu.pkgsoftware.babybuddywidgets.history
 
 import android.view.MotionEvent
 import android.view.View
-import android.view.ViewConfiguration
 import com.squareup.phrase.Phrase
 import eu.pkgsoftware.babybuddywidgets.BaseFragment
 import eu.pkgsoftware.babybuddywidgets.Constants.FeedingMethodEnum
@@ -55,17 +54,17 @@ class TimelineEntry(private val fragment: BaseFragment, private var _entry: Time
             binding.root.visibility = View.INVISIBLE
         } else {
             binding.root.visibility = View.VISIBLE
-            if (BabyBuddyClient.ACTIVITIES.TUMMY_TIME == entry.type) {
+            if (BabyBuddyClient.ACTIVITIES.TUMMY_TIME == entry.appType) {
                 configureTummyTime()
-            } else if (BabyBuddyClient.EVENTS.CHANGE == entry.type) {
+            } else if (BabyBuddyClient.EVENTS.CHANGE == entry.appType) {
                 configureChange()
-            } else if (BabyBuddyClient.ACTIVITIES.SLEEP == entry.type) {
+            } else if (BabyBuddyClient.ACTIVITIES.SLEEP == entry.appType) {
                 configureSleep()
-            } else if (BabyBuddyClient.ACTIVITIES.FEEDING == entry.type) {
+            } else if (BabyBuddyClient.ACTIVITIES.FEEDING == entry.appType) {
                 configureFeeding()
-            } else if (BabyBuddyClient.EVENTS.NOTE == entry.type) {
+            } else if (BabyBuddyClient.EVENTS.NOTE == entry.appType) {
                 configureNote()
-            } else if (BabyBuddyClient.ACTIVITIES.PUMPING == entry.type) {
+            } else if (BabyBuddyClient.ACTIVITIES.PUMPING == entry.appType) {
                 configurePumping()
             } else {
                 configureDefaultView()
@@ -84,12 +83,16 @@ class TimelineEntry(private val fragment: BaseFragment, private var _entry: Time
     }
 
     private fun defaultPhraseFields(phrase: Phrase): Phrase {
+        val start_time = TIME_FORMAT.format(entry!!.start)
+        val end_time = TIME_FORMAT.format(entry!!.end)
+        val opt_time_range = if (start_time == end_time) start_time else "$start_time - $end_time"
         return phrase
-            .putOptional("type", entry!!.type)
+            .putOptional("type", entry!!.appType)
             .putOptional("start_date", DATE_FORMAT.format(entry!!.start))
             .putOptional("start_time", TIME_FORMAT.format(entry!!.start))
             .putOptional("end_date", DATE_FORMAT.format(entry!!.end))
             .putOptional("end_time", TIME_FORMAT.format(entry!!.end))
+            .putOptional("opt_time_range", opt_time_range)
             .putOptional("notes", entry!!.notes.trim { it <= ' ' })
     }
 
@@ -97,7 +100,7 @@ class TimelineEntry(private val fragment: BaseFragment, private var _entry: Time
         hideAllSubviews()
         binding.viewGroup.getChildAt(0).visibility = View.VISIBLE
         val message = defaultPhraseFields(
-            Phrase.from("{type}\n{start_date}  {start_time} - {end_time}")
+            Phrase.from("{type}\n{start_date}  {opt_time_range}")
         ).format().toString()
         binding.defaultContent.text = message
     }
@@ -106,7 +109,7 @@ class TimelineEntry(private val fragment: BaseFragment, private var _entry: Time
         hideAllSubviews()
         binding.tummyTimeView.visibility = View.VISIBLE
         val message = defaultPhraseFields(
-            Phrase.from("{start_date}  {start_time} - {end_time}\n{notes}")
+            Phrase.from("{start_date}  {opt_time_range}\n{notes}")
         ).format().toString().trim { it <= ' ' }
         binding.tummytimeMilestoneText.text = message
     }
@@ -128,7 +131,7 @@ class TimelineEntry(private val fragment: BaseFragment, private var _entry: Time
         hideAllSubviews()
         binding.sleepView.visibility = View.VISIBLE
         val message = defaultPhraseFields(
-            Phrase.from("{start_date}  {start_time} - {end_time}\n{notes}")
+            Phrase.from("{start_date}  {opt_time_range}\n{notes}")
         ).format().toString().trim { it <= ' ' }
         binding.sleepText.text = message.trim { it <= ' ' }
     }
@@ -146,7 +149,7 @@ class TimelineEntry(private val fragment: BaseFragment, private var _entry: Time
         hideAllSubviews()
         binding.pumpingTimeView.visibility = View.VISIBLE
         val message = defaultPhraseFields(
-            Phrase.from("{start_date}  {start_time} - {end_time}\n{notes}")
+            Phrase.from("{start_date}  {opt_time_range}\n{notes}")
         ).format().toString().trim { it <= ' ' }
         binding.pumpingTimeNotes.text = message.trim { it <= ' ' }
     }
@@ -183,7 +186,7 @@ class TimelineEntry(private val fragment: BaseFragment, private var _entry: Time
             else -> binding.solidFoodImage.visibility = View.VISIBLE
         }
         val message = defaultPhraseFields(
-            Phrase.from("{start_date}  {start_time} - {end_time}\n{notes}")
+            Phrase.from("{start_date}  {opt_time_range}\n{notes}")
         ).format().toString().trim { it <= ' ' }
         binding.feedingText.text = message.trim { it <= ' ' }
     }
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/logic/EndAwareContinuousListIntegrator.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/logic/EndAwareContinuousListIntegrator.kt
index c6a0ee4..eaef5ac 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/logic/EndAwareContinuousListIntegrator.kt
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/logic/EndAwareContinuousListIntegrator.kt
@@ -18,6 +18,10 @@ class EndAwareContinuousListIntegrator : ContinuousListIntegrator() {
         super.clear()
     }
 
+    fun getItemsCount(className: String): Int {
+        return itemCounts[className] ?: 0
+    }
+
     fun computeValidCount(): Int {
         val allItems = super.items
         val itemsByClass = mutableMapOf<String, MutableList<ContinuousListItem>>()
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/login/LoginFragment.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/login/LoginFragment.kt
index 4e84088..a5334d9 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/login/LoginFragment.kt
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/login/LoginFragment.kt
@@ -175,6 +175,8 @@ class LoginFragment : BaseFragment() {
             progressDialog.hide()
             moveToLoggedIn()
         } else {
+            mainActivity.storage.deleteAllData()
+
             val qrCode = QRCode(this, null, true)
             qrCode.cameraOnInitialized = Runnable {
                 binding.qrCode.isEnabled = qrCode.hasCamera
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/login/Utils.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/login/Utils.kt
index 6377b9a..f39b695 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/login/Utils.kt
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/login/Utils.kt
@@ -101,4 +101,14 @@ class Utils(val mainActivity: MainActivity) {
             promise.failed("No app token found.")
         }
     }
+
+    companion object {
+        fun padToLen(s: String, c: Char, length: Int): String {
+            val sBuilder = StringBuilder(s)
+            while (sBuilder.length < length) {
+                sBuilder.insert(0, c)
+            }
+            return sBuilder.toString()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/BabyBuddyClient.java b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/BabyBuddyClient.java
index 59a7653..fff00c2 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/BabyBuddyClient.java
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/BabyBuddyClient.java
@@ -40,7 +40,6 @@
 
 public class BabyBuddyClient extends StreamReader {
     public static final String DATE_FORMAT_STRING = "yyyy-MM-dd'T'HH:mm:ssX";
-    public static final String DATE_QUERY_FORMAT_STRING = "yyyy-MM-dd'T'HH:mm:ss";
 
     public static class ACTIVITIES {
         public static final String SLEEP = "sleep";
@@ -123,7 +122,7 @@ private static String dateToQueryString(Date date) {
         if (date == null) {
             return null;
         }
-        final SimpleDateFormat sdf = new SimpleDateFormat(DATE_QUERY_FORMAT_STRING, Locale.ENGLISH);
+        final SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT_STRING, Locale.ENGLISH);
         sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
         return sdf.format(date);
     }
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/ChildrenStateTracker.java b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/ChildrenStateTracker.java
index 625a72c..881b264 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/ChildrenStateTracker.java
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/ChildrenStateTracker.java
@@ -265,6 +265,10 @@ public boolean isClosed() {
             return closed || ChildrenStateTracker.this.closed;
         }
 
+        public ChildrenStateTracker getTracker() {
+            return ChildrenStateTracker.this;
+        }
+
         private void update() {
             if (isClosed()) {
                 return;
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/CoordinatedDisconnectDialog.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/CoordinatedDisconnectDialog.kt
index 7c0d587..46fa1fb 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/CoordinatedDisconnectDialog.kt
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/CoordinatedDisconnectDialog.kt
@@ -4,11 +4,12 @@ import android.app.ProgressDialog
 import android.content.DialogInterface
 import androidx.fragment.app.Fragment
 import androidx.navigation.Navigation.findNavController
+import eu.pkgsoftware.babybuddywidgets.BaseFragment
 import eu.pkgsoftware.babybuddywidgets.CredStore
 import eu.pkgsoftware.babybuddywidgets.R
 import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.ConnectingDialogInterface
 
-class CoordinatedDisconnectDialog(val fragment: Fragment, val credStore: CredStore) {
+class CoordinatedDisconnectDialog(val fragment: BaseFragment, val credStore: CredStore) {
     private val dialog = ProgressDialog(fragment.requireContext())
     private var uniqueCounter = 1
     private val progressTrackers = mutableMapOf<String, Long>()
@@ -21,7 +22,7 @@ class CoordinatedDisconnectDialog(val fragment: Fragment, val credStore: CredSto
             ProgressDialog.BUTTON_NEGATIVE,
             fragment.resources.getString(R.string.disconnect_dialog_logout)
         ) { dialogInterface: DialogInterface, i: Int ->
-            credStore.clearLoginData()
+            fragment.mainActivity.logout()
             findNavController(fragment.requireView()).navigate(R.id.logoutOperation)
         }
     }
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/ServerAccessProviderInterface.java b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/ServerAccessProviderInterface.java
index b8d05d3..cce5d12 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/ServerAccessProviderInterface.java
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/ServerAccessProviderInterface.java
@@ -2,7 +2,10 @@
 
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Map;
+
 public interface ServerAccessProviderInterface {
     @NotNull String getAppToken();
     @NotNull String getServerUrl();
+    @NotNull Map<String, String> getAuthCookies();
 }
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/babybuddy/Client.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/babybuddy/Client.kt
index cf23acb..5ad75ff 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/babybuddy/Client.kt
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/babybuddy/Client.kt
@@ -1,5 +1,8 @@
 package eu.pkgsoftware.babybuddywidgets.networking.babybuddy
 
+import com.fasterxml.jackson.databind.JsonNode
+import com.fasterxml.jackson.databind.node.ObjectNode
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import eu.pkgsoftware.babybuddywidgets.debugging.GlobalDebugObject
 import eu.pkgsoftware.babybuddywidgets.networking.RequestCodeFailure
 import eu.pkgsoftware.babybuddywidgets.networking.ServerAccessProviderInterface
@@ -16,9 +19,12 @@ import kotlinx.coroutines.withContext
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import okhttp3.Response
+import okio.Buffer
+import okio.BufferedSink
 import retrofit2.Call
 import retrofit2.Retrofit
 import retrofit2.converter.jackson.JacksonConverterFactory
+import java.io.ByteArrayOutputStream
 import java.net.MalformedURLException
 import java.net.URL
 import kotlin.random.Random
@@ -28,23 +34,53 @@ import kotlin.reflect.KTypeProjection
 import kotlin.reflect.KVariance
 import kotlin.reflect.full.createType
 import kotlin.reflect.full.findAnnotation
+import kotlin.reflect.full.findParameterByName
 import kotlin.reflect.full.functions
+import kotlin.reflect.full.valueParameters
 import kotlin.reflect.jvm.javaMethod
 
 fun genRequestId(): String {
     return Random.nextInt(0xFFFFFF + 1).toString(16).padStart(6, '0')
 }
 
-class AuthInterceptor(private val authToken: String) : Interceptor {
+class AuthInterceptor(
+    private val authToken: String,
+    private val cookies: Map<String, String>
+) : Interceptor {
     override fun intercept(chain: Interceptor.Chain): Response {
         val originalRequest = chain.request()
         val requestWithAuth = originalRequest.newBuilder()
             .header("Authorization", authToken)
+            .header("Cookie", cookies.map { "${it.key}=${it.value}" }.joinToString("; "))
             .build()
         return chain.proceed(requestWithAuth)
     }
 }
 
+class DebugNetworkInterceptor : Interceptor {
+    override fun intercept(chain: Interceptor.Chain): Response {
+        val request = chain.request()
+        val response = chain.proceed(request)
+
+        val cookie = request.header("Cookie")?.let {
+            "Cookie: $it"
+        } ?: "No cookies"
+
+        val buf = Buffer();
+        request.body()?.writeTo(buf) ?: buf.writeUtf8("null");
+        val bodyStream = ByteArrayOutputStream(10000)
+        buf.copyTo(bodyStream)
+
+        GlobalDebugObject.log(
+            "Raw request: ${request.url()} - " +
+            "Request body: ${bodyStream} - " +
+            "Response: ${response.message()} - " +
+            cookie
+        )
+        return response
+    }
+}
+
 class InvalidBody() : Exception("Invalid body")
 
 data class PaginatedResult<T> (
@@ -55,7 +91,8 @@ data class PaginatedResult<T> (
 
 class Client(val credStore: ServerAccessProviderInterface) {
     val httpClient = OkHttpClient.Builder()
-        .addInterceptor(AuthInterceptor("Token " + credStore.appToken))
+        .addInterceptor(AuthInterceptor("Token " + credStore.appToken, credStore.authCookies))
+        .addInterceptor(DebugNetworkInterceptor())
         .build()
 
     val retrofit = Retrofit.Builder()
@@ -197,4 +234,49 @@ class Client(val credStore: ServerAccessProviderInterface) {
         }
         return selected
     }
-}
\ No newline at end of file
+
+    suspend fun <T : TimeEntry> createEntry(itemClass: KClass<T>, item: T): T {
+        val REQID = genRequestId()
+        val klass = item.javaClass.kotlin
+
+        val desiredArgumentType = JsonNode::class.createType()
+        val desiredReturnType = Call::class.createType(
+            arguments = listOf(
+                KTypeProjection(
+                    KVariance.INVARIANT,
+                    itemClass.createType()
+                )
+            )
+        )
+        var selected: KFunction<*>? = null
+        for (func in ApiInterface::class.functions) {
+            if (desiredArgumentType == func.findParameterByName("data")?.type) {
+                if (desiredReturnType == func.returnType) {
+                    selected = func
+                }
+            }
+        }
+
+        if (selected == null) {
+            throw IncorrectApiConfiguration(
+                "${REQID} V2Client::createEntry setter for ${klass.qualifiedName} is missing"
+            )
+        }
+
+        val mapper = jacksonObjectMapper()
+        val node = mapper.valueToTree<ObjectNode>(item)
+        node.remove("id")
+
+        GlobalDebugObject.log("${REQID} V2Client::createEntry ${klass.simpleName}")
+        return withContext(Dispatchers.IO) {
+            try {
+                val call: Call<T> = selected.javaMethod!!.invoke(api, node) as Call<T>
+                return@withContext executeCall(call)
+            }
+            catch (e: Exception) {
+                GlobalDebugObject.log("${REQID} V2Client::createEntry ${klass.simpleName} !exception! ${e.message}")
+                throw e
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/babybuddy/DateHandling.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/babybuddy/DateHandling.kt
index 60973bc..49100dd 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/babybuddy/DateHandling.kt
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/babybuddy/DateHandling.kt
@@ -1,10 +1,5 @@
 package eu.pkgsoftware.babybuddywidgets.networking.babybuddy
 
-import com.fasterxml.jackson.core.JsonParser
-import com.fasterxml.jackson.core.JsonToken
-import com.fasterxml.jackson.databind.DeserializationContext
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer
-import java.io.IOException
 import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.util.Date
@@ -31,6 +26,11 @@ fun parseNullOrDate(s: String, format: String): Date? {
     }
 }
 
+fun formatDate(d: Date, format: String): String {
+    val sdf = SimpleDateFormat(format, Locale.ENGLISH)
+    return sdf.format(d)
+}
+
 fun clientToServerTime(d: Date): Date {
     return Date(d.time + SystemServerTimeOffset)
 }
@@ -39,39 +39,6 @@ fun serverTimeToClientTime(d: Date): Date {
     return Date(d.time - SystemServerTimeOffset)
 }
 
-
-class DateTimeDeserializer : StdDeserializer<Date>(Date::class.java) {
-    override fun deserialize(p: JsonParser, ctxt: DeserializationContext?): Date {
-        p.text?.let {
-            parseNullOrDate(it, DATE_TIME_FORMAT_STRING)?.let {
-                return serverTimeToClientTime(it)
-            }
-        }
-        throw IOException("Invalid date string ${p.text}")
-    }
-}
-
-class DateOnlyDeserializer : StdDeserializer<Date>(Date::class.java) {
-    override fun deserialize(p: JsonParser, ctxt: DeserializationContext?): Date {
-        p.text?.let {
-            parseNullOrDate(it, DATE_ONLY_FORMAT_STRING)?.let {
-                return it
-            }
-        }
-        throw IOException("Invalid date string ${p.text}")
-    }
-}
-
-class AnyDateTimeDeserializer : StdDeserializer<Date>(Date::class.java) {
-    override fun deserialize(p: JsonParser, ctxt: DeserializationContext?): Date {
-        p.text?.let {
-            parseNullOrDate(it, DATE_TIME_FORMAT_STRING)?.let {
-                return serverTimeToClientTime(it)
-            }
-            parseNullOrDate(it, DATE_ONLY_FORMAT_STRING)?.let {
-                return it
-            }
-        }
-        throw IOException("Invalid date string ${p.text}")
-    }
+fun nowServer(): Date {
+    return clientToServerTime(Date())
 }
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/babybuddy/models/ApiInterface.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/babybuddy/models/ApiInterface.kt
index 5e19db9..ed2b398 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/babybuddy/models/ApiInterface.kt
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/babybuddy/models/ApiInterface.kt
@@ -1,8 +1,14 @@
 package eu.pkgsoftware.babybuddywidgets.networking.babybuddy.models
 
+import com.fasterxml.jackson.databind.JsonNode
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import retrofit2.Call
+import retrofit2.http.Body
 import retrofit2.http.DELETE
 import retrofit2.http.GET
+import retrofit2.http.Header
+import retrofit2.http.Headers
+import retrofit2.http.POST
 import retrofit2.http.Path
 import retrofit2.http.Query
 import retrofit2.http.QueryMap
@@ -14,7 +20,7 @@ interface ApiInterface {
     fun getProfile(): Call<Profile>
 
     @ChildKey("id")
-    @GET("children")
+    @GET("children/")
     fun getChildEntries(
         @Query("offset") offset: Int,
         @Query("limit") limit: Int,
@@ -22,7 +28,7 @@ interface ApiInterface {
     ): Call<PaginatedEntries<Child>>
 
     @ChildKey("child")
-    @GET("sleep")
+    @GET("sleep/")
     fun getSleepEntries(
         @Query("offset") offset: Int,
         @Query("limit") limit: Int,
@@ -30,7 +36,7 @@ interface ApiInterface {
     ): Call<PaginatedEntries<SleepEntry>>
 
     @ChildKey("child")
-    @GET("feedings")
+    @GET("feedings/")
     fun getFeedingEntries(
         @Query("offset") offset: Int,
         @Query("limit") limit: Int,
@@ -38,7 +44,7 @@ interface ApiInterface {
     ): Call<PaginatedEntries<FeedingEntry>>
 
     @ChildKey("child")
-    @GET("tummy-times")
+    @GET("tummy-times/")
     fun getTummyTimeEntries(
         @Query("offset") offset: Int,
         @Query("limit") limit: Int,
@@ -46,7 +52,7 @@ interface ApiInterface {
     ): Call<PaginatedEntries<TummyTimeEntry>>
 
     @ChildKey("child")
-    @GET("pumping")
+    @GET("pumping/")
     fun getPumpingEntries(
         @Query("offset") offset: Int,
         @Query("limit") limit: Int,
@@ -54,7 +60,7 @@ interface ApiInterface {
     ): Call<PaginatedEntries<PumpingEntry>>
 
     @ChildKey("child")
-    @GET("changes")
+    @GET("changes/")
     fun getChangeEntries(
         @Query("offset") offset: Int,
         @Query("limit") limit: Int,
@@ -62,7 +68,7 @@ interface ApiInterface {
     ): Call<PaginatedEntries<ChangeEntry>>
 
     @ChildKey("child")
-    @GET("notes")
+    @GET("notes/")
     fun getNoteEntries(
         @Query("offset") offset: Int,
         @Query("limit") limit: Int,
@@ -70,7 +76,7 @@ interface ApiInterface {
     ): Call<PaginatedEntries<NoteEntry>>
 
     @ChildKey("child")
-    @GET("temperature")
+    @GET("temperature/")
     fun getTemperatureEnties(
         @Query("offset") offset: Int,
         @Query("limit") limit: Int,
@@ -78,7 +84,7 @@ interface ApiInterface {
     ): Call<PaginatedEntries<TemperatureEntry>>
 
     @ChildKey("child")
-    @GET("weight")
+    @GET("weight/")
     fun getWeightEntries(
         @Query("offset") offset: Int,
         @Query("limit") limit: Int,
@@ -86,7 +92,7 @@ interface ApiInterface {
     ): Call<PaginatedEntries<WeightEntry>>
 
     @ChildKey("child")
-    @GET("height")
+    @GET("height/")
     fun getHeightEntries(
         @Query("offset") offset: Int,
         @Query("limit") limit: Int,
@@ -94,7 +100,7 @@ interface ApiInterface {
     ): Call<PaginatedEntries<HeightEntry>>
 
     @ChildKey("child")
-    @GET("head-circumference")
+    @GET("head-circumference/")
     fun getHeadCircumferenceEntries(
         @Query("offset") offset: Int,
         @Query("limit") limit: Int,
@@ -102,7 +108,7 @@ interface ApiInterface {
     ): Call<PaginatedEntries<HeadCircumferenceEntry>>
 
     @ChildKey("child")
-    @GET("bmi")
+    @GET("bmi/")
     fun getBmiEntries(
         @Query("offset") offset: Int,
         @Query("limit") limit: Int,
@@ -114,4 +120,28 @@ interface ApiInterface {
         @Path(value = "type", encoded = true) apiPath: String,
         @Path(value = "id", encoded = true) id: Int,
     ): Call<Any>
+
+    @POST("changes/")
+    @Headers("Content-Type: application/json")
+    fun sendChangeEntry(@Body data: JsonNode): Call<ChangeEntry>
+
+    @POST("sleep/")
+    @Headers("Content-Type: application/json")
+    fun sendSleepEntry(@Body data: JsonNode): Call<SleepEntry>
+
+    @POST("tummy-times/")
+    @Headers("Content-Type: application/json")
+    fun sendTummyTimeEntry(@Body data: JsonNode): Call<TummyTimeEntry>
+
+    @POST("notes/")
+    @Headers("Content-Type: application/json")
+    fun sendNoteEntry(@Body data: JsonNode): Call<NoteEntry>
+
+    @POST("feedings/")
+    @Headers("Content-Type: application/json")
+    fun sendFeedingEntry(@Body data: JsonNode): Call<FeedingEntry>
+
+    @POST("pumping/")
+    @Headers("Content-Type: application/json")
+    fun sendPumpingEntry(@Body data: JsonNode): Call<PumpingEntry>
 }
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/babybuddy/models/Child.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/babybuddy/models/Child.kt
index 1082907..89cf6e7 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/babybuddy/models/Child.kt
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/babybuddy/models/Child.kt
@@ -3,7 +3,7 @@ package eu.pkgsoftware.babybuddywidgets.networking.babybuddy.models
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
-import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.AnyDateTimeDeserializer
+import eu.pkgsoftware.babybuddywidgets.AnyDateTimeDeserializer
 import java.util.Date
 
 @JsonIgnoreProperties(ignoreUnknown = true)
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/babybuddy/models/TimeEntries.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/babybuddy/models/TimeEntries.kt
index 93eb13c..b45f0e9 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/babybuddy/models/TimeEntries.kt
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/babybuddy/models/TimeEntries.kt
@@ -1,12 +1,17 @@
 package eu.pkgsoftware.babybuddywidgets.networking.babybuddy.models
 
+import com.fasterxml.jackson.annotation.JsonGetter
+import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.annotation.JsonSetter
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
+import com.fasterxml.jackson.databind.annotation.JsonSerialize
 import eu.pkgsoftware.babybuddywidgets.networking.BabyBuddyClient.ACTIVITIES
 import eu.pkgsoftware.babybuddywidgets.networking.BabyBuddyClient.EVENTS
-import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.DateTimeDeserializer
-import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.DateOnlyDeserializer
+import eu.pkgsoftware.babybuddywidgets.DateTimeDeserializer
+import eu.pkgsoftware.babybuddywidgets.DateOnlyDeserializer
+import eu.pkgsoftware.babybuddywidgets.DateTimeSerializer
 import java.util.Date
 import kotlin.reflect.KClass
 import kotlin.reflect.full.findAnnotations
@@ -16,8 +21,8 @@ annotation class APIPath(val path: String)
 annotation class UIPath(val path: String)
 
 interface TimeEntry {
-    val type: String
-    val typeId: Int
+    val appType: String
+    val appTypeId: Int
     val id: Int
     val childId: Int
     val start: Date
@@ -33,13 +38,19 @@ interface TimeEntry {
 data class SleepEntry(
     @JsonProperty("id", required = true) override val id: Int,
     @JsonProperty("child", required = true) override val childId: Int,
-    @JsonProperty("start", required = true) @JsonDeserialize(using = DateTimeDeserializer::class) override val start: Date,
-    @JsonProperty("end", required = true) @JsonDeserialize(using = DateTimeDeserializer::class) override val end: Date,
-    @JsonProperty("notes", required = false) val _notes: String?,
+    @JsonDeserialize(using = DateTimeDeserializer::class)
+    @JsonSerialize(using = DateTimeSerializer::class)
+    @JsonProperty("start", required = true)
+    override val start: Date,
+    @JsonDeserialize(using = DateTimeDeserializer::class)
+    @JsonSerialize(using = DateTimeSerializer::class)
+    @JsonProperty("end", required = true)
+    override val end: Date,
+    @JsonSetter("notes") val _notes: String?,
 ) : TimeEntry {
-    override val type: String = ACTIVITIES.SLEEP
-    override val typeId: Int = ACTIVITIES.index(type)
-    override val notes: String = _notes ?: ""
+    override @JsonIgnore val appType: String = ACTIVITIES.SLEEP
+    override @JsonIgnore val appTypeId: Int = ACTIVITIES.index(appType)
+    override @get:JsonGetter("notes") val notes: String = _notes ?: ""
 }
 
 @UIPath("tummy-time")
@@ -49,13 +60,22 @@ data class SleepEntry(
 data class TummyTimeEntry(
     @JsonProperty("id", required = true) override val id: Int,
     @JsonProperty("child", required = true) override val childId: Int,
-    @JsonProperty("start", required = true) @JsonDeserialize(using = DateTimeDeserializer::class) override val start: Date,
-    @JsonProperty("end", required = true) @JsonDeserialize(using = DateTimeDeserializer::class) override val end: Date,
-    @JsonProperty("milestone", required = false) val _notes: String?,
+
+    @JsonDeserialize(using = DateTimeDeserializer::class)
+    @JsonSerialize(using = DateTimeSerializer::class)
+    @JsonProperty("start", required = true)
+    override val start: Date,
+
+    @JsonDeserialize(using = DateTimeDeserializer::class)
+    @JsonSerialize(using = DateTimeSerializer::class)
+    @JsonProperty("end", required = true)
+    override val end: Date,
+
+    @JsonSetter("milestone") val _notes: String?,
 ) : TimeEntry {
-    override val type: String = ACTIVITIES.TUMMY_TIME
-    override val typeId: Int = ACTIVITIES.index(type)
-    override val notes: String = _notes ?: ""
+    override @JsonIgnore val appType: String = ACTIVITIES.TUMMY_TIME
+    override @JsonIgnore val appTypeId: Int = ACTIVITIES.index(appType)
+    override @get:JsonGetter("milestone") val notes: String = _notes ?: ""
 }
 
 @UIPath("feedings")
@@ -65,16 +85,25 @@ data class TummyTimeEntry(
 data class FeedingEntry(
     @JsonProperty("id", required = true) override val id: Int,
     @JsonProperty("child", required = true) override val childId: Int,
-    @JsonProperty("start", required = true) @JsonDeserialize(using = DateTimeDeserializer::class) override val start: Date,
-    @JsonProperty("end", required = true) @JsonDeserialize(using = DateTimeDeserializer::class) override val end: Date,
-    @JsonProperty("notes", required = false) val _notes: String?,
+
+    @JsonDeserialize(using = DateTimeDeserializer::class)
+    @JsonSerialize(using = DateTimeSerializer::class)
+    @JsonProperty("start", required = true)
+    override val start: Date,
+
+    @JsonDeserialize(using = DateTimeDeserializer::class)
+    @JsonSerialize(using = DateTimeSerializer::class)
+    @JsonProperty("end", required = true)
+    override val end: Date,
+
+    @JsonSetter("notes") val _notes: String?,
     @JsonProperty("type", required = true) val feedingType: String,
     @JsonProperty("method", required = true) val feedingMethod: String,
-    @JsonProperty("amount", required = true) val amount: Double,
+    @JsonProperty("amount", required = true) val amount: Double?,
 ) : TimeEntry {
-    override val type: String = ACTIVITIES.FEEDING
-    override val typeId: Int = ACTIVITIES.index(type)
-    override val notes: String = _notes ?: ""
+    override @JsonIgnore val appType: String = ACTIVITIES.FEEDING
+    override @JsonIgnore val appTypeId: Int = ACTIVITIES.index(appType)
+    override @get:JsonGetter("notes") val notes: String = _notes ?: ""
 }
 
 @UIPath("pumping")
@@ -84,17 +113,17 @@ data class FeedingEntry(
 data class PumpingEntry(
     @JsonProperty("id", required = true) override val id: Int,
     @JsonProperty("child", required = true) override val childId: Int,
-    @JsonProperty("start", required = false) @JsonDeserialize(using = DateTimeDeserializer::class) val _start: Date?,
-    @JsonProperty("end", required = false) @JsonDeserialize(using = DateTimeDeserializer::class) val _end: Date?,
-    @JsonProperty("notes", required = false) val _notes: String?,
+    @JsonSetter("start") @JsonDeserialize(using = DateTimeDeserializer::class) val _start: Date?,
+    @JsonSetter("end") @JsonDeserialize(using = DateTimeDeserializer::class) val _end: Date?,
+    @JsonSetter("notes") val _notes: String?,
     @JsonProperty("amount", required = true) val amount: Double,
-    @JsonProperty("time", required = false) @JsonDeserialize(using = DateTimeDeserializer::class) private val _legacyTime: Date?
+    @JsonSetter("time") @JsonDeserialize(using = DateTimeDeserializer::class) private val _legacyTime: Date?
 ) : TimeEntry {
-    override val type: String = ACTIVITIES.PUMPING
-    override val typeId: Int = ACTIVITIES.index(type)
-    override val start: Date = _start ?: _legacyTime!!
-    override val end: Date = _end ?: _legacyTime!!
-    override val notes: String = _notes ?: ""
+    override @JsonIgnore val appType: String = ACTIVITIES.PUMPING
+    override @JsonIgnore val appTypeId: Int = ACTIVITIES.index(appType)
+    override @get:JsonGetter("start") @JsonSerialize(using = DateTimeSerializer::class) val start: Date = _start ?: _legacyTime!!
+    override @get:JsonGetter("end") @JsonSerialize(using = DateTimeSerializer::class) val end: Date = _end ?: _legacyTime!!
+    override @get:JsonGetter("notes") val notes: String = _notes ?: ""
 }
 
 @UIPath("changes")
@@ -102,19 +131,27 @@ data class PumpingEntry(
 @ActivityName(EVENTS.CHANGE)
 @JsonIgnoreProperties(ignoreUnknown = true)
 data class ChangeEntry(
-    @JsonProperty("id", required = true) override val id: Int,
-    @JsonProperty("child", required = true) override val childId: Int,
-    @JsonProperty("time", required = true) @JsonDeserialize(using = DateTimeDeserializer::class) override val start: Date,
-    @JsonProperty("notes", required = false) val _notes: String?,
+    @JsonProperty("id", required = true)
+    override val id: Int,
+
+    @JsonProperty("child", required = true)
+    override val childId: Int,
+
+    @JsonProperty("time", required = true)
+    @JsonDeserialize(using = DateTimeDeserializer::class)
+    @JsonSerialize(using = DateTimeSerializer::class)
+    override val start: Date,
+
+    @JsonSetter("notes") val _notes: String?,
     @JsonProperty("wet", required = true) val wet: Boolean,
     @JsonProperty("solid", required = true) val solid: Boolean,
     @JsonProperty("color", required = true) val color: String,
     @JsonProperty("amount", required = true) val amount: Double?,
 ) : TimeEntry {
-    override val type: String = EVENTS.CHANGE
-    override val typeId: Int = EVENTS.index(type)
+    override @JsonIgnore val appType: String = EVENTS.CHANGE
+    override @JsonIgnore val appTypeId: Int = EVENTS.index(appType)
     override val end: Date = start
-    override val notes: String = _notes ?: ""
+    override @get:JsonGetter("notes") val notes: String = _notes ?: ""
 }
 
 @UIPath("notes")
@@ -122,13 +159,21 @@ data class ChangeEntry(
 @ActivityName(EVENTS.NOTE)
 @JsonIgnoreProperties(ignoreUnknown = true)
 data class NoteEntry(
-    @JsonProperty("id", required = true) override val id: Int,
-    @JsonProperty("child", required = true) override val childId: Int,
-    @JsonProperty("time", required = true) @JsonDeserialize(using = DateTimeDeserializer::class) override val start: Date,
+    @JsonProperty("id", required = true)
+    override val id: Int,
+
+    @JsonProperty("child", required = true)
+    override val childId: Int,
+
+    @JsonProperty("time", required = true)
+    @JsonDeserialize(using = DateTimeDeserializer::class)
+    @JsonSerialize(using = DateTimeSerializer::class)
+    override val start: Date,
+
     @JsonProperty("note", required = false) val _notes: String?,
 ) : TimeEntry {
-    override val type: String = EVENTS.NOTE
-    override val typeId: Int = EVENTS.index(type)
+    override @JsonIgnore val appType: String = EVENTS.NOTE
+    override @JsonIgnore val appTypeId: Int = EVENTS.index(appType)
     override val end: Date = start
     override val notes: String = _notes ?: ""
 }
@@ -144,8 +189,8 @@ data class BmiEntry(
     @JsonProperty("notes", required = false) val _notes: String?,
     @JsonProperty("bmi", required = true) val bmi: Double,
 ) : TimeEntry {
-    override val type: String = EVENTS.BMI
-    override val typeId: Int = EVENTS.index(type)
+    override @JsonIgnore val appType: String = EVENTS.BMI
+    override @JsonIgnore val appTypeId: Int = EVENTS.index(appType)
     override val end: Date = start
     override val notes: String = _notes ?: ""
 }
@@ -161,8 +206,8 @@ data class TemperatureEntry(
     @JsonProperty("notes", required = false) val _notes: String?,
     @JsonProperty("temperature", required = true) val temperature: Double,
 ) : TimeEntry {
-    override val type: String = EVENTS.TEMPERATURE
-    override val typeId: Int = EVENTS.index(type)
+    override @JsonIgnore val appType: String = EVENTS.TEMPERATURE
+    override @JsonIgnore val appTypeId: Int = EVENTS.index(appType)
     override val end: Date = start
     override val notes: String = _notes ?: ""
 }
@@ -178,8 +223,8 @@ data class WeightEntry(
     @JsonProperty("notes", required = false) val _notes: String?,
     @JsonProperty("weight", required = true) val weight: Double,
 ) : TimeEntry {
-    override val type: String = EVENTS.WEIGHT
-    override val typeId: Int = EVENTS.index(type)
+    override @JsonIgnore val appType: String = EVENTS.WEIGHT
+    override @JsonIgnore val appTypeId: Int = EVENTS.index(appType)
     override val end: Date = start
     override val notes: String = _notes ?: ""
 }
@@ -195,8 +240,8 @@ data class HeightEntry(
     @JsonProperty("notes", required = false) val _notes: String?,
     @JsonProperty("height", required = true) val height: Double,
 ) : TimeEntry {
-    override val type: String = EVENTS.HEIGHT
-    override val typeId: Int = EVENTS.index(type)
+    override @JsonIgnore val appType: String = EVENTS.HEIGHT
+    override @JsonIgnore val appTypeId: Int = EVENTS.index(appType)
     override val end: Date = start
     override val notes: String = _notes ?: ""
 }
@@ -212,8 +257,8 @@ data class HeadCircumferenceEntry(
     @JsonProperty("notes", required = false) val _notes: String?,
     @JsonProperty("head_circumference", required = true) val head_circumference: Double,
 ) : TimeEntry {
-    override val type: String = EVENTS.HEAD_CIRCUMFERENCE
-    override val typeId: Int = EVENTS.index(type)
+    override @JsonIgnore val appType: String = EVENTS.HEAD_CIRCUMFERENCE
+    override @JsonIgnore val appTypeId: Int = EVENTS.index(appType)
     override val end: Date = start
     override val notes: String = _notes ?: ""
 }
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/timers/EmptyTimerListProvider.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/timers/EmptyTimerListProvider.kt
deleted file mode 100644
index ea02749..0000000
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/timers/EmptyTimerListProvider.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package eu.pkgsoftware.babybuddywidgets.timers
-
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-
-class EmptyTimerListProvider : RecyclerView.Adapter<TimerListViewHolder>() {
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TimerListViewHolder {
-        throw NotImplementedError()
-    }
-
-    override fun onBindViewHolder(holder: TimerListViewHolder, position: Int) {}
-
-    override fun getItemCount(): Int {
-        return 0
-    }
-}
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/timers/StoreActivityRouter.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/timers/StoreActivityRouter.kt
deleted file mode 100644
index 8d00fa5..0000000
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/timers/StoreActivityRouter.kt
+++ /dev/null
@@ -1,135 +0,0 @@
-package eu.pkgsoftware.babybuddywidgets.timers
-
-import androidx.core.os.bundleOf
-import androidx.navigation.Navigation.findNavController
-import eu.pkgsoftware.babybuddywidgets.MainActivity
-import eu.pkgsoftware.babybuddywidgets.R
-import eu.pkgsoftware.babybuddywidgets.StoreFunction
-import eu.pkgsoftware.babybuddywidgets.networking.BabyBuddyClient.ACTIVITIES
-import eu.pkgsoftware.babybuddywidgets.networking.BabyBuddyClient.RequestCallback
-import eu.pkgsoftware.babybuddywidgets.networking.BabyBuddyClient.Timer
-import eu.pkgsoftware.babybuddywidgets.utils.AsyncClientRequest
-import eu.pkgsoftware.babybuddywidgets.utils.Promise
-import kotlinx.coroutines.launch
-import kotlin.coroutines.Continuation
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
-import kotlin.coroutines.suspendCoroutine
-
-class InvalidActivityException : java.lang.Exception() {}
-
-class StoreActivityRouter(val mainActivity: MainActivity) {
-    private val client = mainActivity.client
-
-    private abstract inner class DeferredStoreFunction(
-        val activityName: String,
-        val timer: Timer,
-        val suspensionScope: Continuation<Boolean>
-    ) : StoreFunction<Boolean> {
-        override fun name(): String {
-            return activityName
-        }
-
-        override fun timerStopped() {
-            mainActivity.scope.launch {
-                try {
-                    AsyncClientRequest.call<Boolean> {
-                        client.deleteTimer(timer.id, it)
-                    }
-                } catch (e: java.lang.Exception) {
-                    suspensionScope.resumeWithException(e)
-                    return@launch
-                }
-                suspensionScope.resume(true)
-            }
-        }
-
-        override fun cancel() {
-            suspensionScope.resume(false)
-        }
-
-        override fun error(error: java.lang.Exception) {
-            suspensionScope.resumeWithException(error)
-        }
-
-        override fun response(response: Boolean?) {
-            suspensionScope.resume(response ?: true)
-        }
-    }
-
-    private interface SimpleStoreFunctionInterface {
-        fun store(callback: RequestCallback<Boolean>)
-    }
-
-    private inner class SimpleStoreFunction(
-        activityName: String,
-        timer: Timer,
-        suspensionScope: Continuation<Boolean>,
-        val func: SimpleStoreFunctionInterface
-    ) : DeferredStoreFunction(activityName, timer, suspensionScope) {
-        override fun store(timer: Timer, callback: RequestCallback<Boolean>) {
-            func.store(callback)
-        }
-    }
-
-    suspend fun asyncStore(activity: String, notes: String, timer: Timer): Boolean {
-        return suspendCoroutine<Boolean> { continuation ->
-            val storeInterface = when (activity) {
-                ACTIVITIES.SLEEP -> SimpleStoreFunction(
-                    activity,
-                    timer,
-                    continuation,
-                    object : SimpleStoreFunctionInterface {
-                        override fun store(callback: RequestCallback<Boolean>) {
-                            client.createSleepRecordFromTimer(timer, notes, callback)
-                        }
-                    }
-                )
-
-                ACTIVITIES.TUMMY_TIME -> SimpleStoreFunction(
-                    activity,
-                    timer,
-                    continuation,
-                    object : SimpleStoreFunctionInterface {
-                        override fun store(callback: RequestCallback<Boolean>) {
-                            client.createTummyTimeRecordFromTimer(timer, notes, callback)
-                        }
-                    }
-                )
-
-                ACTIVITIES.FEEDING -> {
-                    mainActivity.selectedTimer = timer
-                    findNavController(mainActivity.findViewById(R.id.nav_host_fragment_content_main)).navigate(
-                        R.id.action_loggedInFragment2_to_feedingFragment, bundleOf("notes" to notes)
-                    )
-                    continuation.resume(false)
-                    return@suspendCoroutine
-                }
-
-                else -> {
-                    continuation.resumeWithException(InvalidActivityException())
-                    return@suspendCoroutine
-                }
-            }
-            mainActivity.storeActivity(timer, storeInterface)
-        }
-    }
-
-    fun store(
-        activity: String,
-        notes: String,
-        timer: Timer,
-        promise: Promise<Boolean, java.lang.Exception>
-    ) {
-        mainActivity.scope.launch {
-            val result: Boolean
-            try {
-                result = asyncStore(activity, notes, timer)
-            } catch (e: java.lang.Exception) {
-                promise.failed(e)
-                return@launch
-            }
-            promise.succeeded(result)
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/timers/TimerControlInterface.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/timers/TimerControlInterface.kt
index d440f5c..7361934 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/timers/TimerControlInterface.kt
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/timers/TimerControlInterface.kt
@@ -8,15 +8,16 @@ interface TimersUpdatedCallback {
     fun newTimerListLoaded(timers: Array<Timer>)
 }
 
-class TranslatedException(message: String, val originalError: java.lang.Exception?) : Exception(message) {
+class TranslatedException(message: String, val originalError: java.lang.Exception?) :
+    Exception(message) {
 }
 
 interface TimerControlInterface {
     fun createNewTimer(timer: Timer, cb: Promise<Timer, TranslatedException>)
     fun startTimer(timer: Timer, cb: Promise<Timer, TranslatedException>)
     fun stopTimer(timer: Timer, cb: Promise<Any, TranslatedException>)
-    fun storeActivity(timer: Timer, activity: String, notes: String, cb: Promise<Boolean, Exception>)
     fun registerTimersUpdatedCallback(callback: TimersUpdatedCallback)
+    fun unregisterTimersUpdatedCallback(callback: TimersUpdatedCallback)
     fun getNotes(timer: Timer): Notes
     fun setNotes(timer: Timer, notes: Notes?)
 }
\ No newline at end of file
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/timers/TimerControllersV2.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/timers/TimerControllersV2.kt
new file mode 100644
index 0000000..1823a78
--- /dev/null
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/timers/TimerControllersV2.kt
@@ -0,0 +1,1058 @@
+package eu.pkgsoftware.babybuddywidgets.timers
+
+import android.os.Handler
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.Button
+import android.widget.ImageButton
+import android.widget.LinearLayout
+import android.widget.Spinner
+import androidx.core.view.children
+import androidx.core.view.isVisible
+import androidx.core.widget.addTextChangedListener
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.squareup.phrase.Phrase
+import eu.pkgsoftware.babybuddywidgets.BaseFragment
+import eu.pkgsoftware.babybuddywidgets.Constants.FeedingMethodEnum
+import eu.pkgsoftware.babybuddywidgets.Constants.FeedingTypeEnum
+import eu.pkgsoftware.babybuddywidgets.Constants.FeedingTypeEnumValues
+import eu.pkgsoftware.babybuddywidgets.DialogCallback
+import eu.pkgsoftware.babybuddywidgets.R
+import eu.pkgsoftware.babybuddywidgets.StoreFunction
+import eu.pkgsoftware.babybuddywidgets.databinding.BabyManagerBinding
+import eu.pkgsoftware.babybuddywidgets.databinding.DiaperLoggingEntryBinding
+import eu.pkgsoftware.babybuddywidgets.databinding.FeedingLoggingEntryBinding
+import eu.pkgsoftware.babybuddywidgets.databinding.GenericTimerLoggingEntryBinding
+import eu.pkgsoftware.babybuddywidgets.databinding.NoteLoggingEntryBinding
+import eu.pkgsoftware.babybuddywidgets.databinding.PumpingLoggingEntryBinding
+import eu.pkgsoftware.babybuddywidgets.login.Utils
+import eu.pkgsoftware.babybuddywidgets.networking.BabyBuddyClient
+import eu.pkgsoftware.babybuddywidgets.networking.BabyBuddyClient.Timer
+import eu.pkgsoftware.babybuddywidgets.networking.RequestCodeFailure
+import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.models.ChangeEntry
+import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.models.FeedingEntry
+import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.models.NoteEntry
+import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.models.PumpingEntry
+import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.models.SleepEntry
+import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.models.TimeEntry
+import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.models.TummyTimeEntry
+import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.models.classActivityName
+import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.nowServer
+import eu.pkgsoftware.babybuddywidgets.utils.AsyncPromise
+import eu.pkgsoftware.babybuddywidgets.utils.AsyncPromiseFailure
+import eu.pkgsoftware.babybuddywidgets.utils.ConcurrentEventBlocker
+import eu.pkgsoftware.babybuddywidgets.utils.Promise
+import eu.pkgsoftware.babybuddywidgets.widgets.HorizontalDecIncEditor
+import eu.pkgsoftware.babybuddywidgets.widgets.HorizontalNumberPicker
+import eu.pkgsoftware.babybuddywidgets.widgets.SwitchButtonLogic
+import kotlinx.coroutines.Runnable
+import kotlinx.coroutines.launch
+import java.io.IOException
+import java.util.Date
+import kotlin.reflect.KClass
+
+interface ButtonListCallback {
+    fun onSelectionChanged(i: Int)
+}
+
+interface FragmentCallbacks {
+    fun insertControls(view: View)
+    fun removeControls(view: View)
+    fun updateTimeline(newEntry: TimeEntry?)
+}
+
+abstract class LoggingControls(val childId: Int) {
+    abstract val saveButton: ImageButton
+    abstract val controlsView: View
+
+    abstract fun storeStateForSuspend()
+    abstract fun reset()
+    suspend abstract fun save(): TimeEntry?
+
+    open fun updateVisuals() {}
+    open fun postInit() {}
+}
+
+interface TimerBase {
+    fun updateTimer(timer: Timer?)
+}
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+data class GenericTimerRecord(
+    @JsonProperty("note") val note: String
+)
+
+abstract class GenericLoggingController(
+    val fragment: BaseFragment,
+    childId: Int,
+    val timerControl: TimerControlInterface,
+    val entryKlass: KClass<*>
+) : LoggingControls(childId), TimerBase, StoreFunction<TimeEntry> {
+    protected abstract suspend fun createEntry(timer: Timer): TimeEntry
+
+    val bindings = GenericTimerLoggingEntryBinding.inflate(fragment.layoutInflater)
+    val typeName: String = classActivityName(entryKlass)
+
+    open val uiIconList = bindings.icons.children
+    open val uiNoteEditor = bindings.noteEditor
+    open val uiCurrentTimerTime = bindings.currentTimerTime
+
+    override val saveButton: ImageButton = bindings.sendButton
+    override val controlsView: View = bindings.root
+
+    private var timer: Timer? = null
+    private var storingPromise: Promise<TimeEntry?, Exception>? = null
+
+    override fun postInit() {
+        fragment.mainActivity.storage.child<GenericTimerRecord>(childId, typeName)?.let {
+            uiNoteEditor.setText(it.note)
+        }
+
+        val children = uiIconList.toList()
+        for (i in BabyBuddyClient.ACTIVITIES.ALL.indices) {
+            if (BabyBuddyClient.ACTIVITIES.ALL[i] == typeName) {
+                children[i].visibility = View.VISIBLE
+            } else {
+                children[i].visibility = View.GONE
+            }
+        }
+
+        updateVisuals()
+    }
+
+    override fun storeStateForSuspend() {
+        fragment.mainActivity.storage.child(
+            childId, typeName, GenericTimerRecord(uiNoteEditor.text.toString())
+        )
+    }
+
+    override fun reset() {
+        uiNoteEditor.setText("")
+        storeStateForSuspend()
+    }
+
+    override suspend fun save(): TimeEntry? {
+        storingPromise?.let {
+            throw IOException("Already storing activity of type ${typeName}")
+        }
+
+        timer?.let { timer ->
+            try {
+                try {
+                    val result = AsyncPromise.call<TimeEntry?, Exception> { promise ->
+                        storingPromise = promise
+                        fragment.mainActivity.storeActivity(timer, this)
+                    }
+                    return result
+                }
+                finally {
+                    storingPromise = null
+                }
+            }
+            catch (e: AsyncPromiseFailure) {
+                fragment.showError(
+                    true,
+                    R.string.activity_store_failure_message,
+                    R.string.activity_store_failure_server_error
+                )
+            }
+        }
+        throw IOException("Could not store activity of type ${typeName}")
+    }
+
+    override fun updateTimer(timer: Timer?) {
+        this.timer = timer
+        updateVisuals()
+    }
+
+    override fun updateVisuals() {
+        val now = Date()
+        (timer?.start ?: now).let {
+            val diff = now.time - it.time
+
+            val seconds = diff.toInt() / 1000
+            val minutes = seconds / 60
+            val hours = minutes / 60
+
+            uiCurrentTimerTime.text = "HH:MM:ss"
+                .replace("HH".toRegex(), "" + hours)
+                .replace("MM".toRegex(), Utils.padToLen("" + minutes % 60, '0', 2))
+                .replace("ss".toRegex(), Utils.padToLen("" + seconds % 60, '0', 2))
+        }
+    }
+
+    override fun store(
+        timer: Timer,
+        callback: BabyBuddyClient.RequestCallback<TimeEntry>
+    ) {
+        fragment.mainActivity.scope.launch {
+            try {
+                val result = createEntry(timer)
+                timerControl.stopTimer(
+                    timer,
+                    object : Promise<Any, TranslatedException> {
+                        override fun succeeded(s: Any?) {
+                            callback.response(result)
+                        }
+
+                        override fun failed(f: TranslatedException?) {
+                            callback.error(
+                                f?.originalError
+                                    ?: IOException("Failed to stop timer")
+                            )
+                        }
+                    })
+            }
+            catch (e: Exception) {
+                callback.error(e)
+            }
+        }
+    }
+
+    override fun name(): String {
+        return this@GenericLoggingController.typeName
+    }
+
+    override fun stopTimer(timer: Timer) {
+        timerControl.stopTimer(
+            timer,
+            object : Promise<Any, TranslatedException> {
+                override fun succeeded(s: Any?) {
+                    storingPromise!!.succeeded(null)
+                }
+
+                override fun failed(f: TranslatedException?) {
+                    storingPromise!!.failed(f)
+                }
+            })
+    }
+
+    override fun cancel() {
+        storingPromise!!.succeeded(null)
+    }
+
+    override fun error(error: java.lang.Exception) {
+        var message = "" + (error.message ?: "")
+        if ((error is RequestCodeFailure) && (error.hasJSONMessage())) {
+            message = Phrase.from(
+                fragment.requireContext(),
+                R.string.activity_store_failure_server_error
+            )
+                .put("message", "Error while storing activity")
+                .put("server_message", error.jsonErrorMessages().joinToString(", "))
+                .format().toString()
+        }
+
+        fragment.showQuestion(
+            true,
+            fragment.getString(R.string.activity_store_failure_message),
+            message,
+            fragment.getString(R.string.activity_store_failure_cancel),
+            fragment.getString(R.string.activity_store_failure_stop_timer),
+            object : DialogCallback {
+                override fun call(b: Boolean) {
+                    if (!b) {
+                        timer?.let { stopTimer(it) }
+                    } else {
+                        storingPromise!!.succeeded(null)
+                    }
+                }
+            }
+        )
+    }
+
+    override fun response(response: TimeEntry?) {
+        storingPromise!!.succeeded(response)
+    }
+}
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+data class DiaperDataRecord(
+    @JsonProperty("wet") val wet: Boolean,
+    @JsonProperty("solid") val solid: Boolean,
+    @JsonProperty("note") val note: String
+)
+
+class DiaperLoggingController(val fragment: BaseFragment, childId: Int) : LoggingControls(childId) {
+    val bindings = DiaperLoggingEntryBinding.inflate(fragment.layoutInflater)
+    override val controlsView = bindings.root
+    override val saveButton = bindings.sendButton
+
+    val wetLogic = SwitchButtonLogic(
+        bindings.wetDisabledButton, bindings.wetEnabledButton, false
+    )
+    val solidLogic = SwitchButtonLogic(
+        bindings.solidDisabledButton, bindings.solidEnabledButton, false
+    )
+    val noteEditor = bindings.noteEditor
+
+    init {
+        wetLogic.addStateListener { _, _ ->
+            updateSaveEnabledState()
+        }
+        solidLogic.addStateListener { _, _ ->
+            updateSaveEnabledState()
+        }
+
+        fragment.mainActivity.storage.child<DiaperDataRecord>(childId, "diaper")?.let {
+            wetLogic.state = it.wet
+            solidLogic.state = it.solid
+            noteEditor.setText(it.note)
+        }
+
+        updateSaveEnabledState()
+    }
+
+    fun updateSaveEnabledState() {
+        saveButton.visibility = if (wetLogic.state || solidLogic.state) {
+            View.VISIBLE
+        } else {
+            View.GONE
+        }
+    }
+
+    override fun storeStateForSuspend() {
+        val ddr = DiaperDataRecord(
+            wetLogic.state, solidLogic.state, noteEditor.text.toString()
+        )
+        fragment.mainActivity.storage.child(childId, "diaper", ddr)
+    }
+
+    override fun reset() {
+        noteEditor.setText("")
+        wetLogic.state = false
+        solidLogic.state = false
+    }
+
+    suspend override fun save(): TimeEntry {
+        return fragment.mainActivity.client.v2client.createEntry(
+            ChangeEntry::class,
+            ChangeEntry(
+                id = 0,
+                childId = childId,
+                start = nowServer(),
+                _notes = noteEditor.text.toString(),
+                wet = wetLogic.state,
+                solid = solidLogic.state,
+                color = "",
+                amount = null
+            )
+        )
+    }
+}
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+data class NotesDataRecord(
+    @JsonProperty("note") val note: String
+)
+
+class NotesLoggingController(val fragment: BaseFragment, childId: Int) : LoggingControls(childId) {
+    val bindings = NoteLoggingEntryBinding.inflate(fragment.layoutInflater)
+    override val controlsView = bindings.root
+    override val saveButton = bindings.sendButton
+
+    val noteEditor = bindings.noteEditor
+
+    init {
+        noteEditor.addTextChangedListener {
+            updateVisuals()
+        }
+        fragment.mainActivity.storage.child<DiaperDataRecord>(childId, "notes")?.let {
+            noteEditor.setText(it.note)
+        }
+    }
+
+    override fun storeStateForSuspend() {
+        val ddr = NotesDataRecord(noteEditor.text.toString())
+        fragment.mainActivity.storage.child(childId, "notes", ddr)
+    }
+
+    override fun reset() {
+        noteEditor.setText("")
+        updateVisuals()
+    }
+
+    suspend override fun save(): TimeEntry {
+        return fragment.mainActivity.client.v2client.createEntry(
+            NoteEntry::class,
+            NoteEntry(
+                id = 0,
+                childId = childId,
+                start = nowServer(),
+                _notes = noteEditor.text.toString()
+            )
+        )
+    }
+
+    override fun updateVisuals() {
+        super.updateVisuals()
+        saveButton.visibility = if (noteEditor.text.isNotEmpty()) {
+            View.VISIBLE
+        } else {
+            View.GONE
+        }
+    }
+}
+
+class SleepLoggingController(
+    fragment: BaseFragment,
+    childId: Int,
+    timerControl: TimerControlInterface
+) : GenericLoggingController(fragment, childId, timerControl, SleepEntry::class) {
+    override suspend fun createEntry(timer: Timer): TimeEntry {
+        return fragment.mainActivity.client.v2client.createEntry(
+            SleepEntry::class,
+            SleepEntry(
+                id = 0,
+                childId = childId,
+                start = timer.start,
+                end = nowServer(),
+                _notes = bindings.noteEditor.text.toString()
+            )
+        )
+    }
+}
+
+class TummyTimeLoggingController(
+    fragment: BaseFragment,
+    childId: Int,
+    timerControl: TimerControlInterface
+) : GenericLoggingController(fragment, childId, timerControl, TummyTimeEntry::class) {
+    override suspend fun createEntry(timer: Timer): TimeEntry {
+        return fragment.mainActivity.client.v2client.createEntry(
+            TummyTimeEntry::class,
+            TummyTimeEntry(
+                id = 0,
+                childId = childId,
+                start = timer.start,
+                end = nowServer(),
+                _notes = bindings.noteEditor.text.toString()
+            )
+        )
+    }
+}
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+data class FeedingRecord(
+    @JsonProperty("amount") val amount: Double?,
+    @JsonProperty("note") val note: String,
+    @JsonProperty("feeding_type") val feedingType: String?,
+    @JsonProperty("feeding_method") val feedingMethod: String?,
+)
+
+class FeedingLoggingController(
+    fragment: BaseFragment,
+    childId: Int,
+    timerControl: TimerControlInterface
+) : GenericLoggingController(fragment, childId, timerControl, TummyTimeEntry::class) {
+    val feedingBinding = FeedingLoggingEntryBinding.inflate(fragment.layoutInflater)
+
+    override val uiCurrentTimerTime = feedingBinding.currentTimerTime
+    override val uiNoteEditor = feedingBinding.noteEditor
+    override val saveButton: ImageButton = feedingBinding.sendButton
+    override val controlsView: View = feedingBinding.root
+
+    private var assignedMethodButtons: List<FeedingMethodEnum> = emptyList()
+    private var selectedType: String? = null
+    private var selectedMethod: String? = null
+
+    override fun postInit() {
+        super.postInit()
+
+        populateButtonList(
+            fragment.resources.getTextArray(R.array.feedingTypes),
+            feedingBinding.feedingTypeButtons,
+            feedingBinding.feedingTypeSpinner,
+            object : ButtonListCallback {
+                override fun onSelectionChanged(i: Int) {
+                    selectedType = FeedingTypeEnumValues[i]!!.post_name
+                    selectedMethod = null
+                    setupFeedingMethodButtons(FeedingTypeEnumValues[i]!!)
+                    feedingBinding.feedingMethodButtons.visibility = View.VISIBLE
+                    feedingBinding.feedingMethodSpinner.visibility = View.GONE
+                    updateVisuals()
+                }
+            }
+        )
+        feedingBinding.feedingTypeSpinner.onItemSelectedListener =
+            object : AdapterView.OnItemSelectedListener {
+                override fun onItemSelected(
+                    parent: AdapterView<*>?,
+                    view: View?,
+                    position: Int,
+                    id: Long
+                ) {
+                    val newType = FeedingTypeEnumValues[position]!!.post_name
+                    if (newType == selectedType) return
+                    selectedType = newType
+                    selectedMethod = null
+                    setupFeedingMethodButtons(FeedingTypeEnumValues[position]!!)
+                    feedingBinding.feedingMethodButtons.visibility = View.VISIBLE
+                    feedingBinding.feedingMethodSpinner.visibility = View.GONE
+                    updateVisuals()
+                }
+
+                override fun onNothingSelected(parent: AdapterView<*>?) {
+                    feedingBinding.feedingMethodSpinner.visibility = View.GONE
+                    feedingBinding.feedingMethodButtons.visibility = View.GONE
+                }
+            }
+
+        feedingBinding.amountNumberPicker.value = null
+
+        fragment.mainActivity.storage.child<FeedingRecord>(childId, "feeding")?.let {
+            feedingBinding.amountNumberPicker.value = it.amount
+            feedingBinding.noteEditor.setText(it.note)
+
+            selectedType = null
+            selectedMethod = null
+
+            it.feedingType?.let {
+                try {
+                    feedingBinding.feedingTypeSpinner.setSelection(FeedingTypeEnum.byPostName(it).value)
+                    selectedType = it
+                    feedingBinding.feedingTypeButtons.visibility = View.GONE
+                    feedingBinding.feedingTypeSpinner.visibility = View.VISIBLE
+                    setupFeedingMethodButtons(FeedingTypeEnum.byPostName(it))
+                }
+                catch (_: NoSuchElementException) {
+                }
+            }
+            it.feedingMethod?.let {
+                if (selectedType != null) {
+                    try {
+                        assignedMethodButtons.indexOf(FeedingMethodEnum.byPostName(it)).let {
+                            feedingBinding.feedingMethodSpinner.setSelection(it)
+                        }
+                        selectedMethod = it
+                        feedingBinding.feedingMethodButtons.visibility = View.GONE
+                        feedingBinding.feedingMethodSpinner.visibility = View.VISIBLE
+                    }
+                    catch (_: NoSuchElementException) {
+                    }
+                }
+            }
+        }
+
+        updateVisuals()
+    }
+
+    override fun storeStateForSuspend() {
+        val fr = FeedingRecord(
+            feedingBinding.amountNumberPicker.value?.toDouble(),
+            feedingBinding.noteEditor.text.toString(),
+            selectedType,
+            selectedMethod,
+        )
+        fragment.mainActivity.storage.child(childId, "feeding", fr)
+    }
+
+    override fun reset() {
+        feedingBinding.amountNumberPicker.value = null
+        feedingBinding.noteEditor.setText("")
+        selectedType = null
+        selectedMethod = null
+        storeStateForSuspend()
+    }
+
+    override fun updateVisuals() {
+        super.updateVisuals()
+
+        val selectedType = selectedType
+        if (selectedType == null) {
+            feedingBinding.feedingTypeButtons.visibility = View.VISIBLE
+            feedingBinding.feedingTypeSpinner.visibility = View.GONE
+            feedingBinding.feedingMethodButtons.visibility = View.GONE
+            feedingBinding.feedingMethodSpinner.visibility = View.GONE
+        } else if (selectedMethod == null) {
+            setupFeedingMethodButtons(FeedingTypeEnum.byPostName(selectedType))
+            feedingBinding.feedingTypeButtons.visibility = View.GONE
+            feedingBinding.feedingTypeSpinner.visibility = View.VISIBLE
+            feedingBinding.feedingMethodButtons.visibility = View.VISIBLE
+            feedingBinding.feedingMethodSpinner.visibility = View.GONE
+        } else {
+            feedingBinding.feedingTypeButtons.visibility = View.GONE
+            feedingBinding.feedingTypeSpinner.visibility = View.VISIBLE
+            feedingBinding.feedingMethodButtons.visibility = View.GONE
+            feedingBinding.feedingMethodSpinner.visibility = View.VISIBLE
+        }
+
+        if (feedingBinding.feedingTypeSpinner.isVisible && feedingBinding.feedingMethodSpinner.isVisible) {
+            saveButton.visibility = View.VISIBLE
+        } else {
+            saveButton.visibility = View.GONE
+        }
+    }
+
+    override suspend fun createEntry(timer: Timer): TimeEntry {
+        return fragment.mainActivity.client.v2client.createEntry(
+            FeedingEntry::class,
+            FeedingEntry(
+                id = 0,
+                childId = childId,
+                start = timer.start,
+                end = nowServer(),
+                feedingType = selectedType!!,
+                feedingMethod = selectedMethod!!,
+                amount = feedingBinding.amountNumberPicker.value?.toDouble(),
+                _notes = feedingBinding.noteEditor.text.toString()
+            )
+        )
+    }
+
+    private fun populateButtonList(
+        textArray: Array<CharSequence>,
+        buttons: ViewGroup,
+        spinner: Spinner,
+        callback: ButtonListCallback
+    ) {
+        spinner.visibility = View.GONE
+        buttons.visibility = View.VISIBLE
+        buttons.removeAllViewsInLayout()
+        for (i in textArray.indices) {
+            val button = Button(fragment.requireContext())
+            button.setOnClickListener {
+                spinner.setSelection(i)
+                spinner.visibility = View.VISIBLE
+                buttons.visibility = View.GONE
+                callback.onSelectionChanged(i)
+            }
+            button.text = textArray[i]
+            button.setLayoutParams(
+                LinearLayout.LayoutParams(
+                    LinearLayout.LayoutParams.WRAP_CONTENT,
+                    LinearLayout.LayoutParams.WRAP_CONTENT,
+                    1f
+                )
+            )
+            buttons.addView(button)
+        }
+    }
+
+    private fun setupFeedingMethodButtons(type: FeedingTypeEnum) {
+        when (type) {
+            FeedingTypeEnum.BREAST_MILK -> {
+                assignedMethodButtons = listOf(
+                    FeedingMethodEnum.LEFT_BREAST,
+                    FeedingMethodEnum.RIGHT_BREAST,
+                    FeedingMethodEnum.BOTH_BREASTS,
+                    FeedingMethodEnum.BOTTLE,
+                    FeedingMethodEnum.PARENT_FED,
+                    FeedingMethodEnum.SELF_FED,
+                )
+            }
+
+            else -> {
+                assignedMethodButtons = listOf(
+                    FeedingMethodEnum.BOTTLE,
+                    FeedingMethodEnum.PARENT_FED,
+                    FeedingMethodEnum.SELF_FED,
+                )
+            }
+        }
+
+        val orgItems: Array<CharSequence> = fragment.resources.getTextArray(R.array.feedingMethods)
+        val textItems: MutableList<CharSequence> = ArrayList(10)
+        for (i in assignedMethodButtons.indices) {
+            textItems.add(orgItems[assignedMethodButtons.get(i).value])
+        }
+        feedingBinding.feedingMethodSpinner.setAdapter(
+            ArrayAdapter<CharSequence>(
+                fragment.requireContext(),
+                android.R.layout.simple_spinner_dropdown_item,
+                textItems
+            )
+        )
+        populateButtonList(
+            textItems.toTypedArray<CharSequence>(),
+            feedingBinding.feedingMethodButtons,
+            feedingBinding.feedingMethodSpinner,
+            object : ButtonListCallback {
+                override fun onSelectionChanged(i: Int) {
+                    selectedMethod = assignedMethodButtons[i].post_name
+                    updateVisuals()
+                }
+            }
+        )
+        feedingBinding.feedingMethodSpinner.onItemSelectedListener =
+            object : AdapterView.OnItemSelectedListener {
+                override fun onItemSelected(
+                    parent: AdapterView<*>?,
+                    view: View?,
+                    position: Int,
+                    id: Long
+                ) {
+                    selectedMethod = assignedMethodButtons[position].post_name
+                    updateVisuals()
+                }
+
+                override fun onNothingSelected(parent: AdapterView<*>?) {
+                    selectedMethod = null
+                    updateVisuals()
+                }
+            }
+    }
+}
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+data class PumpingRecord(
+    @JsonProperty("amount") val amount: Double,
+    @JsonProperty("note") val note: String,
+)
+
+class PumpingLoggingController(
+    fragment: BaseFragment,
+    childId: Int,
+    timerControl: TimerControlInterface
+) : GenericLoggingController(fragment, childId, timerControl, PumpingEntry::class) {
+    val pumpingBinding = PumpingLoggingEntryBinding.inflate(fragment.layoutInflater)
+
+    override val uiCurrentTimerTime = pumpingBinding.currentTimerTime
+    override val uiNoteEditor = pumpingBinding.noteEditor
+    override val saveButton: ImageButton = pumpingBinding.sendButton
+    override val controlsView: View = pumpingBinding.root
+
+    val amountNumberPicker: HorizontalDecIncEditor = pumpingBinding.amountNumberPicker
+
+    override fun postInit() {
+        super.postInit()
+
+        amountNumberPicker.allowNull = false
+        amountNumberPicker.value = 0.0
+
+        fragment.mainActivity.storage.child<PumpingRecord>(childId, "pumping")?.let {
+            amountNumberPicker.value = it.amount ?: 0.0
+            uiNoteEditor.setText(it.note)
+        }
+
+        updateVisuals()
+    }
+
+    override fun storeStateForSuspend() {
+        val pr = PumpingRecord(
+            pumpingBinding.amountNumberPicker.value?.toDouble() ?: 0.0,
+            pumpingBinding.noteEditor.text.toString()
+        )
+        fragment.mainActivity.storage.child(childId, "pumping", pr)
+    }
+
+    override fun reset() {
+        pumpingBinding.amountNumberPicker.value = null
+        pumpingBinding.noteEditor.setText("")
+        storeStateForSuspend()
+    }
+
+    override suspend fun createEntry(timer: Timer): TimeEntry {
+        return fragment.mainActivity.client.v2client.createEntry(
+            PumpingEntry::class,
+            PumpingEntry(
+                id = 0,
+                childId = childId,
+                _start = timer.start,
+                _end = nowServer(),
+                amount = amountNumberPicker.value!!.toDouble(),
+                _notes = uiNoteEditor.text.toString(),
+                _legacyTime = timer.start
+            )
+        )
+    }
+}
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+data class LoggingButtonControllerStoreState(
+    @JsonProperty("open_state") val openState: Array<String>,
+)
+
+class LoggingButtonController(
+    val fragment: BaseFragment,
+    val bindings: BabyManagerBinding,
+    val controlsInterface: FragmentCallbacks,
+    val child: BabyBuddyClient.Child,
+    val timerControl: TimerControlInterface,
+) : TimersUpdatedCallback {
+    val logicMap = mapOf(
+        BabyBuddyClient.EVENTS.CHANGE to SwitchButtonLogic(
+            bindings.diaperDisabledButton, bindings.diaperEnabledButton, false
+        ),
+        BabyBuddyClient.EVENTS.NOTE to SwitchButtonLogic(
+            bindings.notesDisabledButton, bindings.notesEnabledButton, false
+        ),
+        BabyBuddyClient.ACTIVITIES.SLEEP to SwitchButtonLogic(
+            bindings.sleepDisabledButton, bindings.sleepEnabledButton, false
+        ),
+        BabyBuddyClient.ACTIVITIES.FEEDING to SwitchButtonLogic(
+            bindings.feedingDisabledButton, bindings.feedingEnabledButton, false
+        ),
+        BabyBuddyClient.ACTIVITIES.TUMMY_TIME to SwitchButtonLogic(
+            bindings.tummyTimeDisabledButton, bindings.tummyTimeEnabledButton, false
+        ),
+        BabyBuddyClient.ACTIVITIES.PUMPING to SwitchButtonLogic(
+            bindings.pumpingDisabledButton, bindings.pumpingEnabledButton, false
+        ),
+    )
+
+    val loggingControllers: Map<String, LoggingControls> = mapOf(
+        BabyBuddyClient.EVENTS.CHANGE to DiaperLoggingController(fragment, child.id),
+        BabyBuddyClient.EVENTS.NOTE to NotesLoggingController(fragment, child.id),
+        BabyBuddyClient.ACTIVITIES.SLEEP to SleepLoggingController(
+            fragment, child.id, timerControl
+        ),
+        BabyBuddyClient.ACTIVITIES.TUMMY_TIME to TummyTimeLoggingController(
+            fragment, child.id, timerControl
+        ),
+        BabyBuddyClient.ACTIVITIES.FEEDING to FeedingLoggingController(
+            fragment, child.id, timerControl
+        ),
+        BabyBuddyClient.ACTIVITIES.PUMPING to PumpingLoggingController(
+            fragment, child.id, timerControl
+        ),
+    )
+
+    private var timerHandler: Handler? = Handler(fragment.mainActivity.mainLooper)
+    private var cachedTimers = emptyArray<Timer>()
+    private val timerModificationsBlocker = ConcurrentEventBlocker()
+
+    init {
+        loggingControllers.forEach { (activity, controller) ->
+            controller.postInit()
+
+            logicMap[activity]?.addStateListener { state, userInduced ->
+                fragment.mainActivity.scope.launch {
+                    timerModificationsBlocker.wait()
+                    if (state) {
+                        startTimerFromSwitch(controller, userInduced, activity)
+                    } else {
+                        stopTimerFromSwitch(controller, userInduced, activity)
+                    }
+                }
+            }
+            controller.saveButton.setOnClickListener {
+                fragment.mainActivity.scope.launch {
+                    timerModificationsBlocker.wait()
+                    runSave(activity, controller)
+                }
+            }
+
+            timerControl.registerTimersUpdatedCallback(this)
+        }
+
+        fragment.mainActivity.storage.child<LoggingButtonControllerStoreState>(
+            child.id, "loggingstate"
+        )?.let {
+            for ((k, logic) in logicMap.entries) {
+                if (k !in BabyBuddyClient.EVENTS.ALL) continue
+                if (k in it.openState) {
+                    logic.state = true
+                }
+            }
+        }
+
+        timerHandler()
+    }
+
+    private fun startTimerFromSwitch(
+        controller: LoggingControls,
+        userInduced: Boolean,
+        activity: String
+    ) {
+        controlsInterface.insertControls(controller.controlsView)
+        if (userInduced && (controller is TimerBase)) {
+            cachedTimers.firstOrNull { it.name == activity }?.let {
+                fragment.mainActivity.scope.launch {
+                    try {
+                        timerModificationsBlocker.register {
+                            val newTimer = AsyncPromise.call<Timer, TranslatedException> { promise ->
+                                timerControl.startTimer(it, promise)
+                            }
+                            controller.updateTimer(newTimer)
+                        }
+                    }
+                    catch (e: AsyncPromiseFailure) {
+                        (e.value as? TranslatedException)?.let {
+                            fragment.showError(
+                                true,
+                                R.string.activity_store_failure_message,
+                                it.message
+                            )
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private suspend fun stopTimerFromSwitch(
+        controller: LoggingControls,
+        userInduced: Boolean,
+        activity: String
+    ) {
+        timerModificationsBlocker.register {
+            val timer = cachedTimers.firstOrNull { it.name == activity }
+            if (AsyncPromise.call<Boolean, TranslatedException> { promise ->
+                    var defaultSucceed = true
+                    timer?.let { timer ->
+                        if (timer.active && userInduced) {
+                            val timeMs = nowServer().time - timer.start.time
+                            if (timeMs > 10000) {
+                                defaultSucceed = false;
+
+                                val message = Phrase.from(
+                                    fragment.requireContext(),
+                                    R.string.cancel_timer_warning_message
+                                )
+                                    .put("activity", fragment.translateActivityName(activity))
+                                    .format().toString()
+
+                                fragment.showQuestion(
+                                    true,
+                                    fragment.getString(R.string.cancel_timer_warning_title),
+                                    message,
+                                    fragment.getString(R.string.cancel_timer_warning_stop),
+                                    fragment.getString(R.string.cancel_timer_warning_keep),
+                                    object : DialogCallback {
+                                        override fun call(b: Boolean) {
+                                            promise.succeeded(b)
+                                        }
+                                    }
+                                );
+                            }
+                        }
+                    }
+                    if (defaultSucceed) {
+                        promise.succeeded(true)
+                    }
+                }) {
+                controlsInterface.removeControls(controller.controlsView)
+                if (userInduced && (controller is TimerBase)) {
+                    timer?.let {
+                        fragment.mainActivity.scope.launch {
+                            try {
+                                controller.updateTimer(null)
+                                AsyncPromise.call<Any, TranslatedException> { promise ->
+                                    timerControl.stopTimer(it, promise)
+                                }
+                                controller.updateTimer(null)
+                            }
+                            catch (e: AsyncPromiseFailure) {
+                                (e.value as? TranslatedException)?.let {
+                                    fragment.showError(
+                                        true,
+                                        R.string.activity_store_failure_message,
+                                        it.message
+                                    )
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private fun timerHandler() {
+        timerHandler?.let {
+            it.postDelayed(Runnable { timerHandler() }, 500)
+            for (c in loggingControllers.values) {
+                c.updateVisuals()
+            }
+        }
+    }
+
+    suspend fun runSave(activity: String, controller: LoggingControls) {
+        timerModificationsBlocker.wait()
+        timerModificationsBlocker.register {
+            try {
+                logicMap[activity]?.state = false
+                val te = controller.save()
+                controller.reset()
+                storeStateForSuspend()
+                controlsInterface.updateTimeline(te)
+            }
+            catch (e: RequestCodeFailure) {
+                fragment.showError(
+                    true,
+                    R.string.activity_store_failure_message,
+                    Phrase.from(
+                        fragment.requireContext(),
+                        R.string.activity_store_failure_server_error
+                    )
+                        .put(
+                            "message",
+                            fragment.getString(R.string.activity_store_failure_server_error_general)
+                        )
+                        .put("server_message", e.jsonErrorMessages().joinToString(", "))
+                        .format().toString()
+
+                )
+            }
+            catch (e: IOException) {
+                fragment.showError(
+                    true,
+                    R.string.activity_store_failure_message,
+                    R.string.activity_store_failure_server_error_generic_ioerror
+                )
+            }
+        }
+    }
+
+    fun storeStateForSuspend() {
+        val openState = mutableListOf<String>()
+        for ((name, controller) in loggingControllers) {
+            controller.storeStateForSuspend()
+            if (name in BabyBuddyClient.EVENTS.ALL) {
+                if (logicMap[name]?.state == true) {
+                    openState.add(name)
+                }
+            }
+        }
+        fragment.mainActivity.storage.child(
+            child.id,
+            "loggingstate",
+            LoggingButtonControllerStoreState(openState.toTypedArray())
+        )
+    }
+
+    fun destroy() {
+        storeStateForSuspend()
+        for (controller in loggingControllers.values) {
+            controlsInterface.removeControls(controller.controlsView)
+        }
+        for (logic in logicMap.values) {
+            logic.destroy()
+        }
+        timerControl.unregisterTimersUpdatedCallback(this)
+        timerHandler = null
+    }
+
+    override fun newTimerListLoaded(timers: Array<Timer>) {
+        cachedTimers = timers;
+        if (timerModificationsBlocker.isBlocked) return
+
+        val toDisable =
+            loggingControllers.filter { it.value is TimerBase }.map { it.key }.toMutableList()
+        for (timer in timers) {
+            if (!timer.active) continue
+            loggingControllers[timer.name]?.let { controller ->
+                if (controller is TimerBase) {
+                    toDisable.remove(timer.name)
+
+                    controller.updateTimer(timer)
+                    controller.updateVisuals()
+                    controlsInterface.insertControls(controller.controlsView)
+                }
+            }
+            logicMap[timer.name]?.let { logic ->
+                logic.state = true
+            }
+        }
+        for (name in toDisable) {
+            logicMap[name]?.state = false
+            loggingControllers[name]?.let {
+                controlsInterface.removeControls(it.controlsView)
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/timers/TimerListProvider.java b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/timers/TimerListProvider.java
deleted file mode 100644
index e0341a5..0000000
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/timers/TimerListProvider.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package eu.pkgsoftware.babybuddywidgets.timers;
-
-import android.view.LayoutInflater;
-import android.view.ViewGroup;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import eu.pkgsoftware.babybuddywidgets.BaseFragment;
-import eu.pkgsoftware.babybuddywidgets.history.ChildEventHistoryLoader;
-import eu.pkgsoftware.babybuddywidgets.networking.BabyBuddyClient;
-
-public class TimerListProvider extends RecyclerView.Adapter<TimerListViewHolder> implements TimersUpdatedCallback {
-    private BabyBuddyClient.Timer[] timers = new BabyBuddyClient.Timer[0];
-
-    private final BaseFragment baseFragment;
-    private final List<TimerListViewHolder> holders = new LinkedList<>();
-    private final TimerControlInterface timerControls;
-
-    public TimerListProvider(
-        @NotNull BaseFragment baseFragment,
-        @NotNull TimerControlInterface timerControls
-    ) {
-        super();
-        this.baseFragment = baseFragment;
-        this.timerControls = timerControls;
-        this.timerControls.registerTimersUpdatedCallback(this);
-    }
-
-    private int[] listIds(BabyBuddyClient.Timer[] t) {
-        int[] result = new int[t.length];
-        for (int i = 0; i < t.length; i++) {
-            result[i] = t[i].id;
-        }
-        Arrays.sort(result);
-        return result;
-    }
-
-    private boolean compareIds(BabyBuddyClient.Timer[] t1, BabyBuddyClient.Timer[] t2) {
-        return Arrays.equals(listIds(t1), listIds(t2));
-    }
-
-    private TimerListViewHolder findHolderForTimer(BabyBuddyClient.Timer t) {
-        TimerListViewHolder result = null;
-        for (TimerListViewHolder h : holders) {
-            if (h.getTimer().id == t.id) {
-                if (result != null) {
-                    return null; // Multiple timers - dismiss
-                } else {
-                    result = h;
-                }
-            }
-        }
-        return result;
-    }
-
-    @Override
-    public TimerListViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        eu.pkgsoftware.babybuddywidgets.databinding.QuickTimerEntryBinding entryBinding = eu.pkgsoftware.babybuddywidgets.databinding.QuickTimerEntryBinding.inflate(LayoutInflater.from(parent.getContext()));
-        return new TimerListViewHolder(baseFragment, entryBinding, timerControls);
-    }
-
-    @Override
-    public void onViewAttachedToWindow(@NonNull TimerListViewHolder holder) {
-        super.onViewAttachedToWindow(holder);
-        holders.add(holder);
-    }
-
-    @Override
-    public void onViewDetachedFromWindow(@NonNull TimerListViewHolder holder) {
-        super.onViewDetachedFromWindow(holder);
-        holders.remove(holder);
-    }
-
-    @Override
-    public void onBindViewHolder(TimerListViewHolder holder, int position) {
-        holder.assignTimer(timers[position]);
-    }
-
-    @Override
-    public int getItemCount() {
-        return timers.length;
-    }
-
-    public void close() {
-        for (TimerListViewHolder h : holders) {
-            h.close();
-        }
-    }
-
-    @Override
-    public void newTimerListLoaded(@NonNull BabyBuddyClient.Timer[] timers) {
-        timers = timers.clone();
-        Arrays.sort(timers, (a, b) -> Integer.compare(a.id, b.id));
-
-        if (!compareIds(timers, this.timers)) {
-            this.timers = timers;
-            notifyDataSetChanged();
-        } else {
-            for (int i = 0; i < timers.length; i++) {
-                final TimerListViewHolder timerHolder = findHolderForTimer(timers[i]);
-                if (!this.timers[i].equals(timers[i])) {
-                    BabyBuddyClient.Timer probeTimer = timers[i].clone();
-                    probeTimer.start = this.timers[i].start;
-                    probeTimer.end = this.timers[i].end;
-                    boolean probeTimerEqual = probeTimer.equals(this.timers[i]);
-
-                    this.timers[i] = timers[i];
-                    if (probeTimerEqual && (timerHolder != null)) {
-                        timerHolder.assignTimer(timers[i]);
-                    } else {
-                        notifyItemChanged(i);
-                    }
-                } else if (timerHolder != null) {
-                    timerHolder.updateNoChange();
-                }
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/timers/TimerListViewHolder.java b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/timers/TimerListViewHolder.java
deleted file mode 100644
index 466aebb..0000000
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/timers/TimerListViewHolder.java
+++ /dev/null
@@ -1,250 +0,0 @@
-package eu.pkgsoftware.babybuddywidgets.timers;
-
-import android.os.Handler;
-
-import com.squareup.phrase.Phrase;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Date;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import eu.pkgsoftware.babybuddywidgets.BaseFragment;
-import eu.pkgsoftware.babybuddywidgets.CredStore;
-import eu.pkgsoftware.babybuddywidgets.NotesControl;
-import eu.pkgsoftware.babybuddywidgets.NotesEditorLogic;
-import eu.pkgsoftware.babybuddywidgets.R;
-import eu.pkgsoftware.babybuddywidgets.databinding.NotesEditorBinding;
-import eu.pkgsoftware.babybuddywidgets.databinding.QuickTimerEntryBinding;
-import eu.pkgsoftware.babybuddywidgets.networking.BabyBuddyClient;
-import eu.pkgsoftware.babybuddywidgets.networking.RequestCodeFailure;
-import eu.pkgsoftware.babybuddywidgets.utils.Promise;
-import eu.pkgsoftware.babybuddywidgets.widgets.SwitchButtonLogic;
-
-public class TimerListViewHolder extends RecyclerView.ViewHolder {
-    private final @NotNull QuickTimerEntryBinding binding;
-
-    private final @NotNull BaseFragment baseFragment;
-    private final BabyBuddyClient client;
-    private final Handler timerHandler;
-    private final TimerControlInterface timerControl;
-
-    private final SwitchButtonLogic notesEditorSwitch;
-    private final NotesEditorLogic notesEditor;
-
-    private SwitchButtonLogic startStopLogic = null;
-
-    private BabyBuddyClient.Timer timer = null;
-    private Long timerStartTime = null;
-
-    private boolean isClosed = false;
-
-    private String padToLen(String s, char c, int length) {
-        StringBuilder sBuilder = new StringBuilder(s);
-        while (sBuilder.length() < length) {
-            sBuilder.insert(0, c);
-        }
-        return sBuilder.toString();
-    }
-
-    private boolean newUpdatedPosted = false;
-
-    private void updateTimerTime() {
-        if (timerStartTime == null) {
-            binding.currentTimerTime.setText("");
-        } else {
-            long diff = System.currentTimeMillis() + timerStartTime;
-
-            int seconds = (int) diff / 1000;
-            int minutes = seconds / 60;
-            int hours = minutes / 60;
-
-            binding.currentTimerTime.setText(
-                "HH:MM:ss"
-                    .replaceAll("HH", "" + hours)
-                    .replaceAll("MM", padToLen("" + (minutes % 60), '0', 2))
-                    .replaceAll("ss", padToLen("" + (seconds % 60), '0', 2))
-            );
-
-            if (!newUpdatedPosted) {
-                timerHandler.postDelayed(() -> {
-                    newUpdatedPosted = false;
-                    if (!isClosed) {
-                        updateTimerTime();
-                    }
-                }, 500);
-                newUpdatedPosted = true;
-            }
-        }
-    }
-
-    public TimerListViewHolder(
-        BaseFragment baseFragment,
-        QuickTimerEntryBinding binding,
-        TimerControlInterface timerControl
-    ) {
-        super(binding.getRoot());
-
-        this.baseFragment = baseFragment;
-        this.binding = binding;
-        this.timerControl = timerControl;
-
-        client = baseFragment.getMainActivity().getClient();
-
-        binding.currentTimerTime.setText("");
-        timerHandler = new Handler(baseFragment.getMainActivity().getMainLooper());
-
-        notesEditorSwitch = new SwitchButtonLogic(
-            binding.addNoteButton, binding.removeNoteButton, false
-        );
-        NotesEditorBinding notesBinding = NotesEditorBinding.inflate(
-            baseFragment.getMainActivity().getLayoutInflater()
-        );
-        binding.verticalRoot.addView(notesBinding.getRoot());
-        notesEditor = new NotesEditorLogic(notesBinding, false);
-        notesEditorSwitch.addStateListener((v, userTriggered) -> notesEditor.setVisible(v));
-
-        startStopLogic = new SwitchButtonLogic(
-            binding.appStartTimerButton,
-            binding.appStopTimerButton,
-            false
-        );
-        startStopLogic.addStateListener(
-            (active, userClicked) -> {
-                if (timer == null) {
-                    return;
-                }
-                if (!userClicked) {
-                    return;
-                }
-
-                if (active) {
-                    this.timerControl.startTimer(timer, new Promise<>() {
-                        @Override
-                        public void succeeded(BabyBuddyClient.Timer t) {
-                            timer = t;
-                            updateActiveState();
-                        }
-
-                        @Override
-                        public void failed(TranslatedException s) {
-                        }
-                    });
-                } else {
-                    if (BabyBuddyClient.ACTIVITIES.index(timer.name) < 0) {
-                        throw new UnsupportedOperationException("Activity does not exist: " + timer.name);
-                    }
-                    this.timerControl.storeActivity(
-                        timer,
-                        timer.name,
-                        notesEditor.getText(),
-                        new Promise<>() {
-                            @Override
-                            public void succeeded(Boolean stopped) {
-                                if (stopped == null) {
-                                    stopped = true;
-                                }
-
-                                if (stopped) {
-                                    timer.active = false;
-                                    updateActiveState();
-
-                                    notesEditor.clearText();
-                                    notesEditorSwitch.setState(false);
-                                }
-                            }
-
-                            @Override
-                            public void failed(Exception e) {
-                                tryResolveStoreError(e);
-                            }
-                        }
-                    );
-                }
-            }
-        );
-    }
-
-    private void tryResolveStoreError(@NotNull Exception error) {
-        new ResolveConflicts(baseFragment, timer, timerControl) {
-            @Override
-            protected void updateTimerActiveState() {
-                updateActiveState();
-            }
-
-            @Override
-            protected void finished() {
-            }
-        }.tryResolveStoreError(error);
-    }
-
-    private void updateActiveState() {
-        startStopLogic.setState(timer.active);
-        if ((timer == null) || (!timer.active)) {
-            timerStartTime = null;
-        } else {
-            timerStartTime = new Date().getTime() - timer.start.getTime() + client.getServerDateOffsetMillis() - System.currentTimeMillis();
-        }
-        updateTimerTime();
-    }
-
-    public void assignTimer(BabyBuddyClient.Timer timer) {
-        if (isClosed) {
-            isClosed = false;
-            updateTimerTime();
-        }
-
-        this.timer = timer;
-
-        String name = timer.readableName();
-        final int activityIndex = BabyBuddyClient.ACTIVITIES.index(timer.name);
-        if (activityIndex >= 0) {
-            final String[] names = baseFragment.getResources().getStringArray(R.array.timerTypeNames);
-            name = names[activityIndex];
-        }
-        binding.timerName.setText(name);
-
-        updateActiveState();
-
-        notesEditor.setNotes(
-            new NotesControl() {
-                @Override
-                public void persistChanges() {
-                    baseFragment.getMainActivity().getCredStore().storePrefs();
-                }
-
-                @Override
-                public void setNotes(@NonNull CredStore.Notes notes) {
-                    timerControl.setNotes(timer, notes);
-                }
-
-                @NonNull
-                @Override
-                public CredStore.Notes getNotes() {
-                    return timerControl.getNotes(timer);
-                }
-            }
-        );
-        notesEditorSwitch.setState(notesEditor.isVisible());
-    }
-
-    /**
-     * Called if a new data frame was received from the server, but no timer-data was
-     * changed.
-     */
-    public void updateNoChange() {
-        // We might have "short circuited" the timer-active state. If this was the case,
-        // re-enable the timer now!
-        updateActiveState();
-    }
-
-    public BabyBuddyClient.Timer getTimer() {
-        return timer.clone();
-    }
-
-    public void close() {
-        timerStartTime = null;
-        isClosed = true;
-    }
-}
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/timers/utils/AmountValuesGenerator.java b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/timers/utils/AmountValuesGenerator.java
new file mode 100644
index 0000000..421dc84
--- /dev/null
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/timers/utils/AmountValuesGenerator.java
@@ -0,0 +1,89 @@
+package eu.pkgsoftware.babybuddywidgets.timers.utils;
+
+import java.text.DecimalFormat;
+
+import eu.pkgsoftware.babybuddywidgets.widgets.HorizontalNumberPicker;
+
+public class AmountValuesGenerator implements HorizontalNumberPicker.ValueGenerator {
+    public static final DecimalFormat FORMAT_VALUE = new DecimalFormat("#.#");
+
+    public long minValue() {
+        return -1L;
+    }
+
+    public long maxValue() {
+        return 1 + 5 * 9;
+    } // 5 orders of magnitude
+
+    private long calcBaseValue(long index) {
+        return (long) Math.round(Math.pow(10, (double) Math.max(0, (index / 9))));
+    }
+
+    public String getValue(long index) {
+        if (index < 0) {
+            return "None";
+        } else {
+            return FORMAT_VALUE.format(getRawValue(index, 0f));
+        }
+    }
+
+    public Double getRawValue(long index, float offset) {
+        if (index + offset < -0.001) {
+            return null;
+        } else {
+            if (offset < 0) {
+                index--;
+                offset += 1.0f;
+                if (index < 0) {
+                    index = 0;
+                    offset = 0.0f;
+                }
+            }
+
+            if (index == 0) {
+                return (double) offset;
+            }
+            return (double) calcBaseValue(index - 1) * (((index - 1) % 9 + 1) + offset);
+        }
+    }
+
+    public long getValueIndex(Double value) {
+        if (value == null) {
+            return -1L;
+        } else {
+            long exp = (long) Math.max(0, Math.floor(Math.log10(value)));
+            long base10 = Math.round(Math.pow(10, exp));
+            double relativeRest = value / base10;
+
+            long index = (long) Math.floor(relativeRest);
+            double offset = relativeRest - index;
+            if (offset >= 0.5) {
+                offset -= 1.0;
+                index += 1;
+            }
+            index += 9 * exp;
+
+            return Math.max(minValue(), Math.min(maxValue(), index));
+        }
+    }
+
+    public double getValueOffset(Double value) {
+        if (value == null) {
+            return 0.0d;
+        } else {
+            long exp = (long) Math.max(0, Math.floor(Math.log10(value)));
+            long base10 = Math.round(Math.pow(10, exp));
+            double relativeRest = value / base10;
+
+            long index = (long) Math.floor(relativeRest);
+            double offset = relativeRest - index;
+            if (offset >= 0.5) {
+                offset -= 1.0;
+                index += 1;
+            }
+            index += 9 * exp;
+
+            return Math.max(-0.5, Math.min(0.5, offset));
+        }
+    }
+}
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/utils/AsyncPromise.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/utils/AsyncPromise.kt
index 16e1738..e218a0a 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/utils/AsyncPromise.kt
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/utils/AsyncPromise.kt
@@ -6,6 +6,8 @@ import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 import kotlin.coroutines.suspendCoroutine
 
+class EmptyException() : Exception()
+
 class AsyncPromiseFailure(val value: Any) : Exception()
 
 class AsyncPromise() {
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/utils/ConcurrentEventBlocker.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/utils/ConcurrentEventBlocker.kt
new file mode 100644
index 0000000..57c6038
--- /dev/null
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/utils/ConcurrentEventBlocker.kt
@@ -0,0 +1,31 @@
+package eu.pkgsoftware.babybuddywidgets.utils
+
+class ConcurrentEventBlocker {
+    private var internalBlockCounter = 0
+    private val subscribed = mutableListOf<Promise<Unit, Exception>>()
+
+    val isBlocked: Boolean
+        get() = internalBlockCounter > 0
+
+    suspend fun wait() {
+        if (internalBlockCounter > 0) {
+            AsyncPromise.call { promise ->
+                subscribed.add(promise)
+            }
+        }
+    }
+
+    suspend fun register(body: suspend () -> Unit) {
+        internalBlockCounter++
+        try {
+            body.invoke()
+        }
+        finally {
+            internalBlockCounter--
+            if (internalBlockCounter == 0) {
+                subscribed.forEach { it.succeeded(Unit) }
+                subscribed.clear()
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/widgets/AutoHGrid.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/widgets/AutoHGrid.kt
new file mode 100644
index 0000000..4658b71
--- /dev/null
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/widgets/AutoHGrid.kt
@@ -0,0 +1,181 @@
+package eu.pkgsoftware.babybuddywidgets.widgets
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.children
+import eu.pkgsoftware.babybuddywidgets.R
+import eu.pkgsoftware.babybuddywidgets.Tools
+
+enum class RowAlign(val value: Int) {
+    TOP(0),
+    CENTER(1),
+    BOTTOM(2)
+}
+
+class AutoHGrid : ViewGroup {
+    internal data class RowData(
+        val children: List<View>,
+        val width: Int,
+        val maxHeight: Int
+    )
+
+    var rowAlign: RowAlign = RowAlign.CENTER
+    var rowSpacing: Float = 0f
+    var equalizeRowWidths: Boolean = false
+
+    constructor(context: Context) : super(context) {
+        init(null, 0)
+    }
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
+        init(attrs, 0)
+    }
+
+    constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(
+        context,
+        attrs,
+        defStyle
+    ) {
+        init(attrs, defStyle)
+    }
+
+    fun init(attrs: AttributeSet?, defStyle: Int) {
+        val typedArray = context.obtainStyledAttributes(attrs, R.styleable.AutoHGrid, defStyle, 0)
+        val rowAlignRaw = typedArray.getInt(R.styleable.AutoHGrid_rowAlign, RowAlign.CENTER.value)
+
+        rowAlign = RowAlign.entries.firstOrNull { it.value == rowAlignRaw } ?: RowAlign.CENTER
+        rowSpacing = typedArray.getDimension(R.styleable.AutoHGrid_rowSpacing, 0f)
+        equalizeRowWidths = typedArray.getBoolean(R.styleable.AutoHGrid_equalizeRowWidths, false)
+
+        typedArray.recycle()
+    }
+
+    private tailrec fun equalizeRowWidths(initialRows: List<RowData>): List<RowData> {
+        val maxWidth = initialRows.maxOf { it.width }
+        val spacing = Tools.dpToPx(context, rowSpacing)
+
+        val resultRows = initialRows.map { row -> row.children.toMutableList() }.toMutableList()
+        var rowWidths = resultRows.map {
+            row -> row.sumOf { it.measuredWidth } + spacing * (row.size - 1)
+        }
+
+        fun generateRowData(): List<RowData> {
+            return resultRows.map {
+                row -> RowData(
+                row,
+                row.sumOf { it.measuredWidth } + spacing * (row.size - 1),
+                row.maxOf { it.measuredHeight })
+            }
+        }
+
+        while (true) {
+            var modified = false
+            for (i in (1 until resultRows.size).reversed()) {
+                val prevI = i - 1
+                if (rowWidths[i] >= rowWidths[prevI]) {
+                    continue
+                }
+                var newRowWidth = rowWidths[i] + resultRows[prevI].last().measuredWidth
+                if (rowWidths[i] > 0) newRowWidth += spacing
+                if (newRowWidth > maxWidth) {
+                    continue
+                }
+                resultRows[i].add(0, resultRows[prevI].removeLast())
+                modified = true
+                break
+            }
+            rowWidths = resultRows.map {
+                row -> row.sumOf { it.measuredWidth } + spacing * (row.size - 1)
+            }
+            val newMaxWidth = rowWidths.maxOrNull() ?: 0
+            if (newMaxWidth < maxWidth) {
+                return equalizeRowWidths(generateRowData())
+            }
+            if (!modified || (newMaxWidth > maxWidth)) {
+                return generateRowData()
+            }
+        }
+    }
+
+    private fun computeRows(width: Int): List<RowData> {
+        val placeableChildren = children.filter { it.visibility != View.GONE }.toList()
+
+        val rows = mutableListOf(mutableListOf<View>())
+        val rowWidths = mutableListOf<Int>()
+
+        val spacing = Tools.dpToPx(context, rowSpacing)
+
+        var currentRowWidth = 0
+        for (child in placeableChildren) {
+            val widthWithSpacing = child.measuredWidth + if (currentRowWidth > 0) spacing else 0
+            if (currentRowWidth + widthWithSpacing > width) {
+                rows.add(mutableListOf())
+                rowWidths.add(currentRowWidth)
+                currentRowWidth = 0
+            }
+            rows.last().add(child)
+            currentRowWidth += child.measuredWidth + if (currentRowWidth > 0) spacing else 0
+        }
+        rowWidths.add(currentRowWidth)
+
+        val result = mutableListOf<RowData>()
+        for (i in rows.indices) {
+            val row = rows[i]
+            if (row.isEmpty()) {
+                continue
+            }
+            result.add(RowData(row, rowWidths[i], row.maxOf { it.measuredHeight }))
+        }
+
+        if (equalizeRowWidths) {
+            return equalizeRowWidths(result)
+        } else {
+            return result
+        }
+    }
+
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        val width = MeasureSpec.getSize(widthMeasureSpec)
+
+        val placeableChildren = children.filter { it.visibility != View.GONE }.toList()
+        for (child in placeableChildren) {
+            measureChild(child, widthMeasureSpec, heightMeasureSpec)
+        }
+
+        val rows = computeRows(width)
+
+        val height = rows.sumOf { it.maxHeight }
+        super.onMeasure(
+            MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+            MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
+        )
+    }
+
+    override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
+        val width = r - l
+        val spacing = Tools.dpToPx(context, rowSpacing)
+
+        val rows = computeRows(width)
+        var currentY = 0
+        for (row in rows) {
+            var currentX = (width - row.width) / 2
+            for (child in row.children) {
+                val yOffset = when (rowAlign) {
+                    RowAlign.TOP -> 0
+                    RowAlign.CENTER -> (row.maxHeight - child.measuredHeight) / 2
+                    RowAlign.BOTTOM -> row.maxHeight - child.measuredHeight
+                }
+                child.layout(
+                    currentX,
+                    currentY + yOffset,
+                    currentX + child.measuredWidth,
+                    currentY + child.measuredHeight + yOffset
+                )
+                currentX += child.measuredWidth + spacing
+            }
+            currentY += row.maxHeight
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/widgets/HorizontalDecIncEditor.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/widgets/HorizontalDecIncEditor.kt
new file mode 100644
index 0000000..7914c47
--- /dev/null
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/widgets/HorizontalDecIncEditor.kt
@@ -0,0 +1,81 @@
+package eu.pkgsoftware.babybuddywidgets.widgets
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.LinearLayout
+import eu.pkgsoftware.babybuddywidgets.databinding.HorizontalDecIncEditorBinding
+import kotlin.math.abs
+import kotlin.math.floor
+import kotlin.math.log10
+import kotlin.math.max
+import kotlin.math.pow
+
+class HorizontalDecIncEditor : LinearLayout {
+    var value: Double?
+        get() {
+            return binding.numberEditor.text.toString().toDoubleOrNull()
+        }
+        set(value) {
+            val v = value.let {
+                if ((it == null) || (it < 0.0)) {
+                    if (allowNull) {
+                        return@let null
+                    } else {
+                        return@let 0.0
+                    }
+                }
+                it
+            }
+            if (v == null) {
+                binding.numberEditor.setText("")
+            } else {
+                binding.numberEditor.setText(v.toString())
+            }
+        }
+
+    var allowNull: Boolean = true
+        set(value) {
+            field = value
+            if (!value && this.value == null) {
+                this.value = 0.0
+            }
+        }
+
+    val binding = HorizontalDecIncEditorBinding.inflate(
+        LayoutInflater.from(context), this, true
+    )
+
+    private val incrementValue: Int
+        get() = max(1, (10.0).pow(floor(log10(abs(value?.toDouble() ?: 1.0)))).toInt())
+
+    constructor(context: Context) : super(context) {
+        init()
+    }
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
+        init()
+    }
+
+    constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(
+        context,
+        attrs,
+        defStyle
+    ) {
+        init()
+    }
+
+    private fun init() {
+        layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
+        value = null
+
+        binding.decButton.setOnClickListener {
+            value = (value ?: 0.0) - incrementValue
+            binding.numberEditor.selectAll()
+        }
+        binding.incButton.setOnClickListener {
+            value = (value ?: 0.0) + incrementValue
+            binding.numberEditor.selectAll()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/widgets/SwitchButtonLogic.java b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/widgets/SwitchButtonLogic.java
index 0b2cb62..d96a881 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/widgets/SwitchButtonLogic.java
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/widgets/SwitchButtonLogic.java
@@ -25,12 +25,20 @@ public SwitchButtonLogic(ImageButton onButton, ImageButton offButton, boolean st
         updateVisibilityState();
     }
 
+    public void destroy() {
+        onButton.setOnClickListener(null);
+        offButton.setOnClickListener(null);
+    }
+
     private void updateVisibilityState() {
         onButton.setVisibility(state ? View.GONE : View.VISIBLE);
         offButton.setVisibility(state ? View.VISIBLE : View.GONE);
     }
 
     private void setState(boolean b, boolean userInduced) {
+        if (b == state) {
+            return;
+        }
         state = b;
         updateVisibilityState();
 
diff --git a/app/src/main/res/layout/baby_manager.xml b/app/src/main/res/layout/baby_manager.xml
index 22596ce..9c6ba6d 100644
--- a/app/src/main/res/layout/baby_manager.xml
+++ b/app/src/main/res/layout/baby_manager.xml
@@ -2,144 +2,221 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/relativeLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="16dp">
 
-    <LinearLayout
-        android:id="@+id/changeButtons"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="horizontal"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <TextView
-            android:id="@+id/textView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="24dp"
-            android:layout_weight="0"
-            android:text="@string/diaper_title"
-            android:textAppearance="@style/TextAppearance.AppCompat.Large" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:orientation="horizontal"></LinearLayout>
-
-        <ImageButton
-            android:id="@+id/wetDisabledButton"
-            android:layout_width="64dp"
-            android:layout_height="64dp"
-            android:layout_weight="0"
-            android:scaleType="fitCenter"
-            android:src="@drawable/pkg_not_wet"
-            android:tint="?android:attr/textColorSecondary"
-            android:tintMode="src_in" />
-
-        <ImageButton
-            android:id="@+id/wetEnabledButton"
-            android:layout_width="64dp"
-            android:layout_height="64dp"
-            android:layout_weight="0"
-            android:backgroundTint="#80FF80"
-            android:scaleType="fitCenter"
-            android:src="@drawable/pkg_wet"
-            android:tint="@color/fixed_color_button_text_color"
-            android:tintMode="src_in"
-            android:visibility="gone" />
-
-        <ImageButton
-            android:id="@+id/solidDisabledButton"
-            android:layout_width="64dp"
-            android:layout_height="64dp"
-            android:layout_weight="0"
-            android:scaleType="fitCenter"
-            android:src="@drawable/pkg_no_poop"
-            android:tint="?android:attr/textColorSecondary"
-            android:tintMode="src_in" />
-
-        <ImageButton
-            android:id="@+id/solidEnabledButton"
-            android:layout_width="64dp"
-            android:layout_height="64dp"
-            android:layout_weight="0"
-            android:backgroundTint="#80FF80"
-            android:scaleType="fitCenter"
-            android:src="@drawable/pkg_poop"
-            android:tint="@color/fixed_color_button_text_color"
-            android:tintMode="src_in"
-            android:visibility="gone" />
-
-        <ImageButton
-            android:id="@+id/removeNoteButton"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:layout_margin="4dp"
-            android:layout_weight="0"
-            android:backgroundTint="#80FF80"
-            android:src="@drawable/pkg_notes"
-            android:tint="@color/fixed_color_button_text_color"
-            android:tintMode="src_in"
-            android:visibility="gone" />
-
-        <ImageButton
-            android:id="@+id/addNoteButton"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:layout_margin="4dp"
-            android:layout_weight="0"
-            android:src="@drawable/pkg_no_notes"
-            android:tint="?android:attr/textColorSecondary"
-            android:tintMode="src_in"
-            android:visibility="visible" />
-
-        <ImageButton
-            android:id="@+id/sendChangeButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="4dp"
-            android:layout_weight="0"
-            android:visibility="visible"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@android:drawable/ic_menu_save" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/diaperNotesSlot"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/changeButtons" />
-
     <ScrollView
         android:id="@+id/mainScrollView"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_marginTop="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/diaperNotesSlot">
+        app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/timersList"
+            <eu.pkgsoftware.babybuddywidgets.widgets.AutoHGrid
+                android:id="@+id/newTimerButtons"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"></androidx.recyclerview.widget.RecyclerView>
+                android:layout_height="wrap_content"
+                app:equalizeRowWidths="true"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <ImageButton
+                    android:id="@+id/feedingDisabledButton"
+                    android:layout_width="64dp"
+                    android:layout_height="64dp"
+                    android:layout_weight="0"
+                    android:backgroundTint="@color/timer_button_disabled"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/pkg_bottle"
+                    android:tintMode="src_in"
+                    android:visibility="gone"
+                    app:tint="@color/fixed_color_button_text_color" />
+
+                <ImageButton
+                    android:id="@+id/feedingEnabledButton"
+                    android:layout_width="64dp"
+                    android:layout_height="64dp"
+                    android:layout_weight="0"
+                    android:backgroundTint="@color/feeding_enabled"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/pkg_bottle"
+                    android:tintMode="src_in"
+                    android:visibility="visible"
+                    app:tint="@color/fixed_color_button_text_color" />
+
+                <ImageButton
+                    android:id="@+id/diaperDisabledButton"
+                    android:layout_width="64dp"
+                    android:layout_height="64dp"
+                    android:layout_weight="0"
+                    android:backgroundTint="@color/timer_button_disabled"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/pkg_diaper"
+                    android:tintMode="src_in"
+                    android:visibility="gone"
+                    app:tint="@color/fixed_color_button_text_color" />
+
+                <ImageButton
+                    android:id="@+id/diaperEnabledButton"
+                    android:layout_width="64dp"
+                    android:layout_height="64dp"
+                    android:layout_weight="0"
+                    android:backgroundTint="@color/diaper_enabled"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/pkg_diaper"
+                    android:tintMode="src_in"
+                    android:visibility="visible"
+                    app:tint="@color/fixed_color_button_text_color" />
+
+                <ImageButton
+                    android:id="@+id/sleepDisabledButton"
+                    android:layout_width="64dp"
+                    android:layout_height="64dp"
+                    android:layout_weight="0"
+                    android:backgroundTint="@color/timer_button_disabled"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/pkg_sleep"
+                    android:tintMode="src_in"
+                    android:visibility="gone"
+                    app:tint="@color/fixed_color_button_text_color" />
+
+                <ImageButton
+                    android:id="@+id/sleepEnabledButton"
+                    android:layout_width="64dp"
+                    android:layout_height="64dp"
+                    android:layout_weight="0"
+                    android:backgroundTint="@color/sleep_enabled"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/pkg_sleep"
+                    android:tintMode="src_in"
+                    android:visibility="visible"
+                    app:tint="@color/fixed_color_button_text_color" />
+
+                <ImageButton
+                    android:id="@+id/notesDisabledButton"
+                    android:layout_width="64dp"
+                    android:layout_height="64dp"
+                    android:layout_weight="0"
+                    android:backgroundTint="@color/timer_button_disabled"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/pkg_notes"
+                    android:tintMode="src_in"
+                    android:visibility="gone"
+                    app:tint="@color/fixed_color_button_text_color" />
+
+                <ImageButton
+                    android:id="@+id/notesEnabledButton"
+                    android:layout_width="64dp"
+                    android:layout_height="64dp"
+                    android:layout_weight="0"
+                    android:backgroundTint="@color/notes_enabled"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/pkg_notes"
+                    android:tintMode="src_in"
+                    android:visibility="visible"
+                    app:tint="@color/fixed_color_button_text_color" />
+
+                <ImageButton
+                    android:id="@+id/pumpingDisabledButton"
+                    android:layout_width="64dp"
+                    android:layout_height="64dp"
+                    android:layout_weight="0"
+                    android:backgroundTint="@color/timer_button_disabled"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/pkg_pumping"
+                    android:tintMode="src_in"
+                    android:visibility="gone"
+                    app:tint="@color/fixed_color_button_text_color" />
+
+                <ImageButton
+                    android:id="@+id/pumpingEnabledButton"
+                    android:layout_width="64dp"
+                    android:layout_height="64dp"
+                    android:layout_weight="0"
+                    android:backgroundTint="@color/pumping_enabled"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/pkg_pumping"
+                    android:tintMode="src_in"
+                    android:visibility="visible"
+                    app:tint="@color/fixed_color_button_text_color" />
+
+                <ImageButton
+                    android:id="@+id/tummyTimeDisabledButton"
+                    android:layout_width="64dp"
+                    android:layout_height="64dp"
+                    android:layout_weight="0"
+                    android:backgroundTint="@color/timer_button_disabled"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/pkg_crawl"
+                    android:tintMode="src_in"
+                    android:visibility="gone"
+                    app:tint="@color/fixed_color_button_text_color" />
+
+                <ImageButton
+                    android:id="@+id/tummyTimeEnabledButton"
+                    android:layout_width="64dp"
+                    android:layout_height="64dp"
+                    android:layout_weight="0"
+                    android:backgroundTint="@color/tummy_time_enabled"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/pkg_crawl"
+                    android:tintMode="src_in"
+                    android:visibility="visible"
+                    app:tint="@color/fixed_color_button_text_color" />
+            </eu.pkgsoftware.babybuddywidgets.widgets.AutoHGrid>
+
+            <LinearLayout
+                android:id="@+id/loggingEditors"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginBottom="4dp"
+                android:layout_marginTop="16dp"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <FrameLayout
+                    android:id="@+id/leftTimelineTitleLine"
+                    style="@style/SeparatorLine"
+                    android:layout_width="wrap_content"
+                    android:layout_height="4dp"
+                    android:layout_margin="10dp"
+                    android:layout_weight="1">
+
+                </FrameLayout>
+
+                <TextView
+                    android:id="@+id/timelineTitle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:text="Timeline" />
+
+                <FrameLayout
+                    android:id="@+id/rightTimelineTitleLine"
+                    style="@style/SeparatorLine"
+                    android:layout_width="wrap_content"
+                    android:layout_height="4dp"
+                    android:layout_margin="10dp"
+                    android:layout_weight="1">
+
+                </FrameLayout>
+            </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/innerTimeline"
@@ -155,4 +232,4 @@
 
         </LinearLayout>
     </ScrollView>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/diaper_logging_entry.xml b/app/src/main/res/layout/diaper_logging_entry.xml
new file mode 100644
index 0000000..9aea449
--- /dev/null
+++ b/app/src/main/res/layout/diaper_logging_entry.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <FrameLayout
+        android:id="@+id/sleepIcon"
+        android:layout_width="48dp"
+        android:layout_height="0dp"
+        android:background="@color/diaper_enabled"
+        android:minHeight="48dp"
+        android:padding="8dp"
+        android:layout_marginTop="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintHeight_min="48dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="0"
+            android:scaleType="fitCenter"
+            android:src="@drawable/pkg_diaper"
+            android:tintMode="src_in"
+            android:visibility="visible"
+            app:tint="@color/fixed_color_button_text_color" />
+    </FrameLayout>
+
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/constraintLayout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/sleepIcon"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <EditText
+            android:id="@+id/noteEditor"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_weight="1"
+            android:gravity="top|left"
+            android:hint="@string/activity_notes_hint"
+            android:inputType="textLongMessage|textMultiLine|text"
+            android:maxLines="5"
+            android:minLines="1"
+            android:selectAllOnFocus="false"
+            android:singleLine="false"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/wetButtonGroup" />
+
+        <ImageButton
+            android:id="@+id/sendButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="4dp"
+            android:layout_marginEnd="277dp"
+            android:layout_weight="0"
+            android:visibility="visible"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/noteEditor"
+            app:srcCompat="@android:drawable/ic_menu_save" />
+
+        <LinearLayout
+            android:id="@+id/wetButtonGroup"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <ImageButton
+                android:id="@+id/wetDisabledButton"
+                android:layout_width="64dp"
+                android:layout_height="64dp"
+                android:layout_weight="0"
+                android:scaleType="fitCenter"
+                android:src="@drawable/pkg_not_wet"
+                android:tintMode="src_in"
+                android:visibility="gone"
+                app:tint="?android:attr/textColorSecondary"
+                tools:layout_editor_absoluteX="544dp"
+                tools:layout_editor_absoluteY="29dp" />
+
+            <ImageButton
+                android:id="@+id/wetEnabledButton"
+                android:layout_width="64dp"
+                android:layout_height="64dp"
+                android:layout_weight="0"
+                android:backgroundTint="#80FF80"
+                android:scaleType="fitCenter"
+                android:src="@drawable/pkg_wet"
+                android:tintMode="src_in"
+                android:visibility="visible"
+                app:tint="@color/fixed_color_button_text_color"
+                tools:layout_editor_absoluteX="370dp"
+                tools:layout_editor_absoluteY="0dp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/solidButtonGroup"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintStart_toEndOf="@+id/wetButtonGroup"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <ImageButton
+                android:id="@+id/solidDisabledButton"
+                android:layout_width="64dp"
+                android:layout_height="64dp"
+                android:layout_weight="0"
+                android:scaleType="fitCenter"
+                android:src="@drawable/pkg_no_poop"
+                android:tintMode="src_in"
+                android:visibility="gone"
+                app:tint="?android:attr/textColorSecondary" />
+
+            <ImageButton
+                android:id="@+id/solidEnabledButton"
+                android:layout_width="64dp"
+                android:layout_height="64dp"
+                android:layout_weight="0"
+                android:backgroundTint="#80FF80"
+                android:scaleType="fitCenter"
+                android:src="@drawable/pkg_poop"
+                android:tintMode="src_in"
+                android:visibility="visible"
+                app:tint="@color/fixed_color_button_text_color" />
+        </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/feeding_fragment.xml b/app/src/main/res/layout/feeding_fragment.xml
deleted file mode 100644
index 9b42987..0000000
--- a/app/src/main/res/layout/feeding_fragment.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <eu.pkgsoftware.babybuddywidgets.widgets.HorizontalNumberPicker
-        android:id="@+id/amountNumberPicker"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginStart="16dp"
-        android:visibility="visible"
-        app:colorPrimary="?android:attr/textColorPrimary"
-        app:colorSecondary="?android:attr/textColorSecondary"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:textSize="32dp"
-        app:zeroOnValues="false" />
-
-    <TextView
-        android:id="@+id/amountText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:text="Amount"
-        android:textAppearance="@style/TextAppearance.AppCompat.Large"
-        app:layout_constraintStart_toStartOf="@+id/amountNumberPicker"
-        app:layout_constraintTop_toBottomOf="@id/amountNumberPicker" />
-
-    <LinearLayout
-        android:id="@+id/notes"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="8dp"
-        app:layout_constraintStart_toStartOf="@+id/amountText"
-        app:layout_constraintTop_toBottomOf="@+id/amountText" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="16dp"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:orientation="vertical"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/notes">
-
-        <Spinner
-            android:id="@+id/feedingTypeSpinner"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
-            android:layout_marginTop="8dp"
-            android:entries="@array/feedingTypes" />
-
-        <LinearLayout
-            android:id="@+id/feedingTypeButtons"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="16dp"
-            android:gravity="center"
-            android:orientation="vertical" />
-
-        <LinearLayout
-            android:id="@+id/feedingMethodButtons"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="16dp"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:visibility="gone" />
-
-        <Spinner
-            android:id="@+id/feedingMethodSpinner"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
-            android:layout_marginTop="8dp"
-            android:entries="@array/feedingMethods"
-            android:visibility="gone" />
-
-        <Button
-            android:id="@+id/submitButton"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Save"
-            android:visibility="gone" />
-    </LinearLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/feeding_logging_entry.xml b/app/src/main/res/layout/feeding_logging_entry.xml
new file mode 100644
index 0000000..b3d45ec
--- /dev/null
+++ b/app/src/main/res/layout/feeding_logging_entry.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <FrameLayout
+        android:id="@+id/sleepIcon"
+        android:layout_width="48dp"
+        android:layout_height="0dp"
+        android:background="@color/feeding_enabled"
+        android:minHeight="48dp"
+        android:padding="8dp"
+        android:layout_marginTop="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintHeight_min="48dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="fitCenter"
+            android:src="@drawable/pkg_bottle"
+            android:tintMode="src_in"
+            android:visibility="visible"
+            app:tint="@color/fixed_color_button_text_color" />
+    </FrameLayout>
+
+    <TextView
+        android:id="@+id/currentTimerTime"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="24dp"
+        android:layout_marginTop="8dp"
+        android:layout_weight="0"
+        android:text="1:10:00"
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/sleepIcon"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <EditText
+            android:id="@+id/noteEditor"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="top|left"
+            android:hint="@string/activity_notes_hint"
+            android:inputType="textLongMessage|textMultiLine|text"
+            android:maxLines="5"
+            android:minLines="1"
+            android:selectAllOnFocus="false"
+            android:singleLine="false"
+            app:layout_constraintTop_toBottomOf="@+id/feedingTypeGroup" />
+
+
+        <ImageButton
+            android:id="@+id/sendButton"
+            android:layout_width="56dp"
+            android:layout_height="wrap_content"
+            android:layout_margin="4dp"
+            android:layout_marginEnd="277dp"
+            android:layout_weight="0"
+            android:visibility="visible"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/noteEditor"
+            app:srcCompat="@android:drawable/ic_menu_save" />
+
+        <LinearLayout
+            android:id="@+id/feedingTypeGroup"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="vertical"
+            app:layout_constraintTop_toBottomOf="@id/amountNumberPicker"
+            tools:layout_editor_absoluteX="8dp">
+
+            <Spinner
+                android:id="@+id/feedingTypeSpinner"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="8dp"
+                android:layout_marginTop="8dp"
+                android:entries="@array/feedingTypes" />
+
+            <Spinner
+                android:id="@+id/feedingMethodSpinner"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:entries="@array/feedingMethods"
+                android:visibility="gone"
+                tools:visibility="visible" />
+
+            <eu.pkgsoftware.babybuddywidgets.widgets.AutoHGrid
+                android:id="@+id/feedingMethodButtons"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                tools:visibility="visible" />
+
+            <eu.pkgsoftware.babybuddywidgets.widgets.AutoHGrid
+                android:id="@+id/feedingTypeButtons"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:visibility="visible" />
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/amountText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="16dp"
+            android:text="Amount"
+            android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.TextView.SpinnerItem"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <eu.pkgsoftware.babybuddywidgets.widgets.HorizontalDecIncEditor
+            android:id="@+id/amountNumberPicker"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:visibility="visible"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/amountText" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/generic_timer_logging_entry.xml b/app/src/main/res/layout/generic_timer_logging_entry.xml
new file mode 100644
index 0000000..42210d9
--- /dev/null
+++ b/app/src/main/res/layout/generic_timer_logging_entry.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <EditText
+        android:id="@+id/noteEditor"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_weight="1"
+        android:gravity="top|left"
+        android:hint="@string/activity_notes_hint"
+        android:inputType="textLongMessage|textMultiLine|text"
+        android:maxLines="5"
+        android:minLines="1"
+        android:selectAllOnFocus="false"
+        android:singleLine="false"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toEndOf="@+id/icons"
+        app:layout_constraintTop_toBottomOf="@+id/currentTimerTime" />
+
+    <ImageButton
+        android:id="@+id/sendButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="4dp"
+        android:layout_marginEnd="277dp"
+        android:layout_weight="0"
+        android:visibility="visible"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/noteEditor"
+        app:srcCompat="@android:drawable/ic_menu_save" />
+
+    <LinearLayout
+        android:id="@+id/icons"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_marginTop="8dp"
+        android:minHeight="48dp"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintHeight_min="48dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <FrameLayout
+            android:id="@+id/feedingIcon"
+            android:layout_width="48dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="@color/feeding_enabled"
+            android:padding="8dp">
+
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scaleType="fitCenter"
+                app:srcCompat="@drawable/pkg_bottle" />
+
+        </FrameLayout>
+
+        <FrameLayout
+            android:id="@+id/sleepIcon"
+            android:layout_width="48dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="@color/sleep_enabled"
+            android:padding="8dp">
+
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:srcCompat="@drawable/pkg_sleep" />
+
+        </FrameLayout>
+
+        <FrameLayout
+            android:id="@+id/tummyTimeIcon"
+            android:layout_width="48dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="@color/tummy_time_enabled"
+            android:padding="8dp">
+
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:srcCompat="@drawable/pkg_crawl" />
+
+        </FrameLayout>
+
+        <FrameLayout
+            android:id="@+id/pumpingIcon"
+            android:layout_width="48dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="@color/pumping_enabled"
+            android:padding="8dp">
+
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:srcCompat="@drawable/pkg_pumping" />
+
+        </FrameLayout>
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/currentTimerTime"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="24dp"
+        android:layout_marginTop="8dp"
+        android:layout_weight="0"
+        android:text="1:10:00"
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/horizontal_dec_inc_editor.xml b/app/src/main/res/layout/horizontal_dec_inc_editor.xml
new file mode 100644
index 0000000..a4fab8e
--- /dev/null
+++ b/app/src/main/res/layout/horizontal_dec_inc_editor.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal">
+
+    <Button
+        android:id="@+id/decButton"
+        android:layout_width="54dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="0"
+        android:text="&lt;" />
+
+    <EditText
+        android:id="@+id/numberEditor"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_weight="10"
+        android:ems="10"
+        android:hint="None"
+        android:inputType="numberDecimal"
+        android:selectAllOnFocus="true"
+        android:textAlignment="center" />
+
+    <Button
+        android:id="@+id/incButton"
+        android:layout_width="54dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="0"
+        android:text="&gt;" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/note_logging_entry.xml b/app/src/main/res/layout/note_logging_entry.xml
new file mode 100644
index 0000000..1b46787
--- /dev/null
+++ b/app/src/main/res/layout/note_logging_entry.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <FrameLayout
+        android:id="@+id/sleepIcon"
+        android:layout_width="48dp"
+        android:layout_height="0dp"
+        android:background="@color/notes_enabled"
+        android:minHeight="48dp"
+        android:padding="8dp"
+        android:layout_marginTop="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintHeight_min="48dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="fitCenter"
+            android:src="@drawable/pkg_notes"
+            android:tintMode="src_in"
+            android:visibility="visible"
+            app:tint="@color/fixed_color_button_text_color" />
+    </FrameLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/constraintLayout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/sleepIcon"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <EditText
+            android:id="@+id/noteEditor"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="top|left"
+            android:hint="@string/activity_notes_hint"
+            android:inputType="textLongMessage|textMultiLine|text"
+            android:maxLines="5"
+            android:minLines="1"
+            android:selectAllOnFocus="false"
+            android:singleLine="false"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageButton
+            android:id="@+id/sendButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="4dp"
+            android:layout_weight="0"
+            android:visibility="visible"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/noteEditor"
+            app:srcCompat="@android:drawable/ic_menu_save"
+            tools:visibility="visible" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/pumping_logging_entry.xml b/app/src/main/res/layout/pumping_logging_entry.xml
new file mode 100644
index 0000000..95d4c5e
--- /dev/null
+++ b/app/src/main/res/layout/pumping_logging_entry.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <FrameLayout
+        android:id="@+id/sleepIcon"
+        android:layout_width="48dp"
+        android:layout_height="0dp"
+        android:background="@color/pumping_enabled"
+        android:minHeight="48dp"
+        android:padding="8dp"
+        android:layout_marginTop="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintHeight_min="48dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="fitCenter"
+            android:src="@drawable/pkg_pumping"
+            android:tintMode="src_in"
+            android:visibility="visible"
+            app:tint="@color/fixed_color_button_text_color" />
+    </FrameLayout>
+
+    <TextView
+        android:id="@+id/currentTimerTime"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="24dp"
+        android:layout_marginTop="8dp"
+        android:layout_weight="0"
+        android:text="1:10:00"
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/sleepIcon"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <EditText
+            android:id="@+id/noteEditor"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="top|left"
+            android:hint="@string/activity_notes_hint"
+            android:inputType="textLongMessage|textMultiLine|text"
+            android:maxLines="5"
+            android:minLines="1"
+            android:selectAllOnFocus="false"
+            android:singleLine="false"
+            app:layout_constraintTop_toBottomOf="@+id/amountNumberPicker" />
+
+
+        <ImageButton
+            android:id="@+id/sendButton"
+            android:layout_width="56dp"
+            android:layout_height="wrap_content"
+            android:layout_margin="4dp"
+            android:layout_weight="0"
+            android:visibility="visible"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/noteEditor"
+            app:srcCompat="@android:drawable/ic_menu_save" />
+
+        <TextView
+            android:id="@+id/amountText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="16dp"
+            android:text="Amount"
+            android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.TextView.SpinnerItem"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <eu.pkgsoftware.babybuddywidgets.widgets.HorizontalDecIncEditor
+            android:id="@+id/amountNumberPicker"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:visibility="visible"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/amountText" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/quick_timer_entry.xml b/app/src/main/res/layout/quick_timer_entry.xml
deleted file mode 100644
index 82b0b30..0000000
--- a/app/src/main/res/layout/quick_timer_entry.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center"
-    android:orientation="horizontal"
-    android:layout_marginBottom="8dp">
-
-    <ImageButton
-        android:id="@+id/deleteButton"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
-        android:backgroundTint="#FF0000"
-        android:src="@android:drawable/ic_menu_delete"
-        android:visibility="gone"
-        tools:src="@android:drawable/ic_menu_delete" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:gravity="center"
-        android:id="@+id/verticalRoot">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:gravity="center">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/timerName"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:text="TimerName"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Large" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <Space
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1" />
-
-                    <TextView
-                        android:id="@+id/currentTimerTime"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:text="1:10:00"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
-
-                    <Space
-                        android:layout_width="20dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="0" />
-                </LinearLayout>
-            </LinearLayout>
-
-            <ImageButton
-                android:id="@+id/addNoteButton"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_margin="4dp"
-                android:layout_weight="0"
-                android:src="@drawable/pkg_no_notes"
-                android:tint="?android:attr/textColorSecondary"
-                android:tintMode="src_in"
-                android:visibility="visible" />
-
-            <ImageButton
-                android:id="@+id/removeNoteButton"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_margin="4dp"
-                android:layout_weight="0"
-                android:backgroundTint="#80FF80"
-                android:src="@drawable/pkg_notes"
-                android:tint="@color/fixed_color_button_text_color"
-                android:tintMode="src_in"
-                android:visibility="gone" />
-
-            <ImageButton
-                android:id="@+id/appStartTimerButton"
-                android:layout_width="56dp"
-                android:layout_height="56dp"
-                android:layout_margin="4dp"
-                android:layout_weight="0"
-                android:src="@android:drawable/ic_media_play"
-                android:visibility="visible" />
-
-            <ImageButton
-                android:id="@+id/appStopTimerButton"
-                android:layout_width="56dp"
-                android:layout_height="56dp"
-                android:layout_margin="4dp"
-                android:layout_weight="0"
-                android:src="@android:drawable/ic_menu_save"
-                android:visibility="gone" />
-
-        </LinearLayout>
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/timeline_item.xml b/app/src/main/res/layout/timeline_item.xml
index 8fc913c..32fe9a4 100644
--- a/app/src/main/res/layout/timeline_item.xml
+++ b/app/src/main/res/layout/timeline_item.xml
@@ -57,7 +57,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="0"
-                android:background="#CCCCCC"
+                android:background="@color/notes_enabled"
                 android:minHeight="48dp"
                 android:minWidth="48dp"
                 android:padding="4dp"
@@ -86,7 +86,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="0"
-                android:background="#FF33CC"
+                android:background="@color/pumping_enabled"
                 android:minHeight="48dp"
                 android:minWidth="48dp"
                 android:padding="4dp"
@@ -115,7 +115,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="0"
-                android:background="#BBFFBB"
+                android:background="@color/tummy_time_enabled"
                 android:minHeight="48dp"
                 android:minWidth="48dp"
                 android:padding="4dp"
@@ -144,7 +144,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="0"
-                android:background="#FFFFBB"
+                android:background="@color/diaper_enabled"
                 android:minHeight="48dp"
                 android:minWidth="48dp"
                 android:padding="4dp"
@@ -197,7 +197,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="0"
-                android:background="#BBBBFF"
+                android:background="@color/sleep_enabled"
                 android:minHeight="48dp"
                 android:minWidth="48dp"
                 android:padding="4dp"
@@ -227,7 +227,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="0"
-                android:background="#FFBBBB"
+                android:background="@color/feeding_enabled"
                 android:minHeight="48dp"
                 android:minWidth="48dp"
                 android:padding="4dp"
@@ -240,7 +240,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="0"
-                android:background="#FFBBBB"
+                android:background="@color/feeding_enabled"
                 android:minHeight="48dp"
                 android:minWidth="48dp"
                 android:padding="0dp"
@@ -253,7 +253,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="0"
-                android:background="#FFBBBB"
+                android:background="@color/feeding_enabled"
                 android:minHeight="48dp"
                 android:minWidth="48dp"
                 android:padding="0dp"
@@ -266,7 +266,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="0"
-                android:background="#FFBBBB"
+                android:background="@color/feeding_enabled"
                 android:minHeight="48dp"
                 android:minWidth="48dp"
                 android:padding="4dp"
@@ -279,7 +279,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="0"
-                android:background="#FFBBBB"
+                android:background="@color/feeding_enabled"
                 android:minHeight="48dp"
                 android:minWidth="48dp"
                 android:padding="4dp"
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 4162601..7978349 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -25,19 +25,12 @@
         android:name="eu.pkgsoftware.babybuddywidgets.LoggedInFragment"
         android:label="@string/logged_in_label"
         tools:layout="@layout/logged_in_fragment" >
-        <action
-            android:id="@+id/action_loggedInFragment2_to_feedingFragment"
-            app:destination="@id/feedingFragment" />
         <action
             android:id="@+id/logoutOperation"
             app:destination="@id/LoginFragment"
             app:popUpTo="@id/loggedInFragment2"
             app:popUpToInclusive="true" />
     </fragment>
-    <fragment
-        android:id="@+id/feedingFragment"
-        android:name="eu.pkgsoftware.babybuddywidgets.FeedingFragment"
-        android:label="FeedingFragment" />
     <fragment
         android:id="@+id/aboutFragment"
         android:name="eu.pkgsoftware.babybuddywidgets.AboutFragment"
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index dcdee57..65e4aff 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -41,4 +41,8 @@
     <style name="TutorialArrow">
         <item name="android:backgroundTint">@color/light_tutorial_highlight</item>
     </style>
+
+    <style name="SeparatorLine">
+        <item name="android:background">@color/semi_transparent_light_background</item>
+    </style>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index aa11aee..9929b19 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -92,8 +92,10 @@
     <string name="popup_message_storing">{activity} opslaan …</string>
 
     <!-- Generic store error -->
+    <string name="activity_notes_hint">Notities</string>
     <string name="activity_store_failure_message">Kon activiteit niet opslaan</string>
     <string name="activity_store_failure_server_error">{message}\n\nServer meldt: {server_message}</string>
+    <string name="activity_store_failure_server_error_generic_ioerror">Fout bij opslaan van activiteit</string>
     <string name="activity_store_failure_stop_timer">Stop de timer</string>
     <string name="activity_store_failure_cancel">Annuleren</string>
     <string name="activity_store_failure_failed_to_stop_title">Stoppen van timer</string>
@@ -101,6 +103,10 @@
     <string name="activity_store_failure_start_timer_failed">Starten van timer mislukt</string>
 
     <!--- Store activities: Conflicts -->
+    <string name="cancel_timer_warning_title">Timer stoppen?</string>
+    <string name="cancel_timer_warning_message">De {activity} timer loopt al een lange tijd door. Wil je hem echt stopzetten of laten lopen?</string>
+    <string name="cancel_timer_warning_stop">Stoppen</string>
+    <string name="cancel_timer_warning_keep">Behouden</string>
     <string name="conflicting_activity_title">Overlappende tijd-invoer</string>
     <string name="conflicting_activity_text">
     De timer overlapt met opgeslagen invoer. Kies een actie om het conflict op te lossen.
@@ -151,14 +157,13 @@
     <string name="help_title">Hulp</string>
 
     <!-- Upgrade notifications -->
-    <string name="upgrade_latest_info_version_less_than_or_equal">1.3.0z</string>
+    <string name="upgrade_latest_info_version_less_than_or_equal">2.4.0</string>
     <string name="upgrade_latest_info_title">Update {version}</string>
-    <string name="upgrade_latest_info_note">
-        Deze versie is compatibel met BabyBuddy versie 2.0 en hoger.
-
-        \n\nDe timerfunctie moest worden aangepast om de app te laten werken met Baby Buddy 2.0
-        en hoger: Nu worden alleen de timers die door de app worden ondersteund getoond.
-        Timerbedieningen en handmatige koppelingen van timers aan activiteiten zijn verwijderd.
+    <string name="upgrade_latest_info_note">Deze
+        nieuwe versie van Babybuddy App voegt loggingondersteuning toe voor alle ontbrekende
+        evenementen. Ik heb hard gewerkt aan het nieuwe interface om deze compact en
+        gebruikersvriendelijk te houden. Meld alle bugs of problemen die je hebt met deze nieuwe
+        interface via de optie "Neem contact op met de ontwikkelaar" uit het hoofdmenu.
     </string>
 
     <!-- Disconnect dialog -->
diff --git a/app/src/main/res/values/attrs_auto_h_grid.xml b/app/src/main/res/values/attrs_auto_h_grid.xml
new file mode 100644
index 0000000..5ffb089
--- /dev/null
+++ b/app/src/main/res/values/attrs_auto_h_grid.xml
@@ -0,0 +1,11 @@
+<resources>
+    <declare-styleable name="AutoHGrid">
+        <attr name="rowAlign" format="enum">
+            <enum name="top" value="0"/>
+            <enum name="center" value="1"/>
+            <enum name="bottom" value="2"/>
+        </attr>
+        <attr name="rowSpacing" format="dimension"/>
+        <attr name="equalizeRowWidths" format="boolean"/>
+    </declare-styleable>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a26af05..3c5e639 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -24,4 +24,15 @@
     <color name="semi_transparent_lightgreen_background">#CCAAFFAA</color>
     <color name="very_transparent_dark_background">#44000000</color>
     <color name="very_transparent_light_background">#44FFFFFF</color>
+
+    <color name="timer_button_disabled">#FFDDDDDD</color>
+    <color name="diaper_enabled">#FFFFFFBB</color>
+    <color name="sleep_enabled">#FFBBBBFF</color>
+    <color name="feeding_enabled">#FFFFBBBB</color>
+    <color name="notes_enabled">#55FFEE</color>
+    <color name="pumping_enabled">#FFFF33CC</color>
+    <color name="tummy_time_enabled">#FFBBFFBB</color>
+    <color name="light_blue_400">#FF29B6F6</color>
+    <color name="gray_400">#FFBDBDBD</color>
+    <color name="gray_600">#FF757575</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fe43691..022319f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -97,16 +97,25 @@
     <string name="error_storing_activity_unsupported">Unsupported activity</string>
     <string name="popup_message_storing">Storing {activity} …</string>
 
+    <string name="activity_notes_hint">Notes</string>
+
     <!-- Generic store error -->
     <string name="activity_store_failure_message">Could not store activity</string>
     <string name="activity_store_failure_server_error">{message}\n\nServer reported: {server_message}</string>
     <string name="activity_store_failure_server_error_general">Error while storing activity</string>
+    <string name="activity_store_failure_server_error_generic_ioerror">IO Error while storing activity</string>
     <string name="activity_store_failure_stop_timer">Stop timer</string>
     <string name="activity_store_failure_cancel">Cancel</string>
     <string name="activity_store_failure_failed_to_stop_title">Timer stop</string>
     <string name="activity_store_failure_failed_to_stop_message">Stopping timer failed</string>
     <string name="activity_store_failure_start_timer_failed">Start timer failed</string>
 
+    <!--- Cancel timer warning -->
+    <string name="cancel_timer_warning_title">Stop timer?</string>
+    <string name="cancel_timer_warning_message">The {activity} timer is running for a long time already. Do you really want to stop it or keep it running?</string>
+    <string name="cancel_timer_warning_stop">Stop</string>
+    <string name="cancel_timer_warning_keep">Keep</string>
+
     <!--- Store activities: Conflicts -->
     <string name="conflicting_activity_title">Overlapping time entries</string>
     <string name="conflicting_activity_text">
@@ -161,14 +170,13 @@
     <string name="help_title">Help</string>
 
     <!-- Upgrade notifications -->
-    <string name="upgrade_latest_info_version_less_than_or_equal">1.3.0z</string>
+    <string name="upgrade_latest_info_version_less_than_or_equal">2.4.0</string>
     <string name="upgrade_latest_info_title">Update {version}</string>
-    <string name="upgrade_latest_info_note">
-        This version is compatible with BabyBuddy version 2.0 and higher.
-
-        \n\nThe timer feature had to be changed to make the app work with Baby Buddy 2.0 and higher:
-        Only the timers that are supported by the app are shown now. Timer controls and manual timer
-        associations of timers with activities were removed.
+    <string name="upgrade_latest_info_note">This
+        new version of babybuddy adds logging support for all missing event types. I worked
+        hard on the interface changes to keep them compact and user-friendly. Please report any
+        bugs or issues you have with this new interface via the "contact developer" option
+        in the main menu.
     </string>
 
     <!-- Disconnect dialog -->
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index a6fa420..cc9e12a 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -43,4 +43,8 @@
     <style name="TutorialArrow">
         <item name="android:backgroundTint">@color/dark_tutorial_highlight</item>
     </style>
+
+    <style name="SeparatorLine">
+        <item name="android:background">@color/semi_transparent_dark_background</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/test/java/eu/pkgsoftware/babybuddywidgets/ClientV2IntegrationTest.kt b/app/src/test/java/eu/pkgsoftware/babybuddywidgets/ClientV2IntegrationTest.kt
index 77020c2..ea96334 100644
--- a/app/src/test/java/eu/pkgsoftware/babybuddywidgets/ClientV2IntegrationTest.kt
+++ b/app/src/test/java/eu/pkgsoftware/babybuddywidgets/ClientV2IntegrationTest.kt
@@ -64,6 +64,10 @@ class ClientV2IntegrationTest {
         override fun getServerUrl(): String {
             return _serverUrl
         }
+
+        override fun getAuthCookies(): Map<String, String> {
+            return mapOf()
+        }
     }
 
     suspend fun runObtainListsTest() {
diff --git a/build.gradle b/build.gradle
index fae8032..bebb4f9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.8.22'
+    ext.kotlin_version = '1.9.20'
 
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.2'
+        classpath 'com.android.tools.build:gradle:8.4.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0868069..7031ec4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Dec 30 21:54:35 CET 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/help.makefile b/help.makefile
index 983c066..6511f69 100644
--- a/help.makefile
+++ b/help.makefile
@@ -1,37 +1,23 @@
-.PHONY: all info refresh-flaticon-token stringsxml
+.PHONY: all info refresh-flaticon-token stringsxml clean
 
 define convert_command =
 	convert $(1) -crop "+0+170" -crop "-0-135" $(2)
 endef
 
-help_image_list := \
-	help_insecure_http.png \
-	help_insecure_http_warning.png \
-	help_timer_setup.png \
-	help_create_default_timers.png \
-	help_create_default_timers_menu.png \
-	help_timers_configure.png \
-	help_overview.png \
-	help_events.png \
-	help_feeding_form.png \
-	help_play_button_highlight.png \
-	help_notes_button_highlight.png \
-	help_save_button_highlight.png \
-	help_save_diaper_highlight.png \
-	help_timers_configure2.png \
-	help_login_page.png \
-	help_login_qrcode.png \
-	help_login_homeassistant.png \
-
 TARGET_PATH := app/src/main/res/drawable
 SOURCE_PATH := resources/help_images
 
-all: $(foreach x,$(help_image_list),$(TARGET_PATH)/$(x)) stringsxml
+help_image_list := $(shell ls $(SOURCE_PATH)/direct/ $(SOURCE_PATH)/screenshots/ | grep -E '\.png$$')
+target_image_list := $(foreach x,$(help_image_list),$(TARGET_PATH)/$(x))
 
 HELP_POSTFIXES := \
 	-nl \
 
-stringsxml: app/src/main/res/values/help_strings.xml $(foreach x,$(HELP_POSTFIXES),app/src/main/res/values$(x)/help_strings.xml)
+xml_files := app/src/main/res/values/help_strings.xml $(foreach x,$(HELP_POSTFIXES),app/src/main/res/values$(x)/help_strings.xml)
+
+all: $(target_image_list) stringsxml
+
+stringsxml: $(xml_files)
 
 app/src/main/res/values/help_strings.xml: $(SOURCE_PATH)/help.md $(SOURCE_PATH)/process_markdown.py
 	cd $(SOURCE_PATH) \
@@ -54,3 +40,12 @@ $(TARGET_PATH)/%.png: $(SOURCE_PATH)/screenshots/%.png
 
 $(TARGET_PATH)/%.png: $(SOURCE_PATH)/direct/%.png
 	cp $< $@
+
+define clean_file =
+	rm -f $(1)
+
+endef
+
+clean:
+	$(foreach x,$(target_image_list),$(call clean_file,$(x)))
+	rm -f app/src/main/res/values/help_strings.xml $(foreach x,$(HELP_POSTFIXES),app/src/main/res/values$(x)/help_strings.xml)
diff --git a/resources/help_images/direct/help_create_default_timers.png b/resources/help_images/direct/help_create_default_timers.png
deleted file mode 100644
index eeaf6c4..0000000
Binary files a/resources/help_images/direct/help_create_default_timers.png and /dev/null differ
diff --git a/resources/help_images/direct/help_create_default_timers_menu.png b/resources/help_images/direct/help_create_default_timers_menu.png
deleted file mode 100644
index 5d3e130..0000000
Binary files a/resources/help_images/direct/help_create_default_timers_menu.png and /dev/null differ
diff --git a/resources/help_images/direct/help_notes_button_highlight.png b/resources/help_images/direct/help_notes_button_highlight.png
deleted file mode 100644
index d78be5b..0000000
Binary files a/resources/help_images/direct/help_notes_button_highlight.png and /dev/null differ
diff --git a/resources/help_images/direct/help_notes_button_highlight.xcf b/resources/help_images/direct/help_notes_button_highlight.xcf
deleted file mode 100644
index 3d84b7e..0000000
Binary files a/resources/help_images/direct/help_notes_button_highlight.xcf and /dev/null differ
diff --git a/resources/help_images/direct/help_play_button_highlight.png b/resources/help_images/direct/help_play_button_highlight.png
index aab97ed..566c228 100644
Binary files a/resources/help_images/direct/help_play_button_highlight.png and b/resources/help_images/direct/help_play_button_highlight.png differ
diff --git a/resources/help_images/direct/help_play_button_highlight.xcf b/resources/help_images/direct/help_play_button_highlight.xcf
index 30f2f20..606502a 100644
Binary files a/resources/help_images/direct/help_play_button_highlight.xcf and b/resources/help_images/direct/help_play_button_highlight.xcf differ
diff --git a/resources/help_images/direct/help_save_button_highlight.png b/resources/help_images/direct/help_save_button_highlight.png
index cfd3b68..73efe0d 100644
Binary files a/resources/help_images/direct/help_save_button_highlight.png and b/resources/help_images/direct/help_save_button_highlight.png differ
diff --git a/resources/help_images/direct/help_save_button_highlight.xcf b/resources/help_images/direct/help_save_button_highlight.xcf
index 4dee000..679c557 100644
Binary files a/resources/help_images/direct/help_save_button_highlight.xcf and b/resources/help_images/direct/help_save_button_highlight.xcf differ
diff --git a/resources/help_images/direct/help_save_diaper_highlight.png b/resources/help_images/direct/help_save_diaper_highlight.png
deleted file mode 100644
index adbc0a4..0000000
Binary files a/resources/help_images/direct/help_save_diaper_highlight.png and /dev/null differ
diff --git a/resources/help_images/direct/help_save_diaper_highlight.xcf b/resources/help_images/direct/help_save_diaper_highlight.xcf
deleted file mode 100644
index d2668b7..0000000
Binary files a/resources/help_images/direct/help_save_diaper_highlight.xcf and /dev/null differ
diff --git a/resources/help_images/direct/help_timer_setup.png b/resources/help_images/direct/help_timer_setup.png
deleted file mode 100644
index bb8ae78..0000000
Binary files a/resources/help_images/direct/help_timer_setup.png and /dev/null differ
diff --git a/resources/help_images/direct/help_timers_configure.png b/resources/help_images/direct/help_timers_configure.png
deleted file mode 100644
index 678440b..0000000
Binary files a/resources/help_images/direct/help_timers_configure.png and /dev/null differ
diff --git a/resources/help_images/direct/help_timers_configure2.png b/resources/help_images/direct/help_timers_configure2.png
deleted file mode 100644
index 840c35d..0000000
Binary files a/resources/help_images/direct/help_timers_configure2.png and /dev/null differ
diff --git a/resources/help_images/help-nl.md b/resources/help_images/help-nl.md
index d178508..4e278c5 100644
--- a/resources/help_images/help-nl.md
+++ b/resources/help_images/help-nl.md
@@ -2,7 +2,7 @@
 
 ## Login
 
-![](screenshots/help_login_page.png)
+![](direct/help_login_page.png)
 
 Er zijn twee opties om verbinding te maken met uw Babybuddy-server:
 Voer de URL, gebruikersnaam en wachtwoord van uw Babybuddy-server in. Druk vervolgens op
@@ -40,56 +40,47 @@ zult de QR-code inlogoptie moeten gebruiken om in te loggen op zo'n server.
 
 ## Overzicht
 
-![](screenshots/help_overview.png)
-
+![](screenshots/help_overview_2.png)
 
 Na het inloggen vindt u knoppen voor het registreren van activiteiten in het bovenste deel van het scherm
 en een geschiedenis van recent geregistreerde activiteiten in het onderste deel van het scherm.
 Als u activiteiten logt voor meerdere kinderen, kunt u horizontaal swipen om tussen kinderen te wisselen.
 
-# Using Timers
+# Timers loggen
 
-## Using Timers
+## Timers gebruiken
 
 ![](direct/help_play_button_highlight.png)
 
-Druk op de "afspeelen"-knop om een timer te starten voor de vermelde activiteit.
+Om een timer te starten, drukt u op een van de timer-knoppen in 
+het bovenste gedeelte van de applicatie. Dit zal een timer starten.
 
-## Using Timers
+## Timers gebruiken
 
-![](direct/help_notes_button_highlight.png)
+![](screenshots/help_timer_interface.png)
 
-Terwijl de timer loopt, kunt u notities toevoegen door op de "notities"-knoppen te drukken.
+Het starten van een timer opent een interface gerelateerd aan de zojuist 
+gestarte timer. Vul alle informatie in die u wilt loggen. Zodra alle vereiste 
+velden zijn ingevuld, verschijnt er een opslaan-knop.
 
 ## Using Timers
 
 ![](direct/help_save_button_highlight.png)
 
-Om de timer te stoppen en de activiteit op te slaan, drukt u op de knop "opslaan".
-
-## Feedings
-
-![](screenshots/help_feeding_form.png)
-
-Het opslaan van een voeding toont een tweede formulier, waar het type voeding (bijvoorbeeld vast voedsel) en de methode ingevoerd moeten worden voordat de voeding kan worden opgeslagen.
-
-## Other timers
-
-![](screenshots/help_timers_default.png)
-
-In een eerdere versie van Babybuddy voor Android toonde de app een willekeurig
-aantal timers. Nu zijn standaard alleen timers voor de gebeurtenissen die kunnen worden gevolgd
-door de app zichtbaar. Dit is veranderd om compatibiliteit te bereiken met
-Baby Buddy versie 2.0.
+Zodra de opslaan-knop verschijnt, kan de timer worden gestopt door op de 
+opslaan-knop te drukken. U kunt ook nogmaals op de timer-knop in de bovenste 
+rij klikken om een timer te annuleren in plaats van deze op te slaan.
 
-# Verschoningen registreren
+# Gebeurtenis loggen
 
-## Verschoningen registreren
+## Verschoningen en notities registreren
 
-![](direct/help_save_diaper_highlight.png)
+![](screenshots/help_diaper_logging.png)
 
-De bovenste bedieningselementen maken het mogelijk om verschoningen te registreren. Selecteer het type luier en druk op de
-"opslaan"-knop om de activiteit te registreren. U kunt optioneel notities toevoegen.
+Naast timer-gebeurtenissen biedt de bovenste rij ook de mogelijkheid om 
+niet-timer-gebeurtenissen te loggen, zoals verschoningen en algemene notities.
+De bedieningselementen werken op dezelfde manier als voor het timer-loggen, 
+maar zonder een timer.
 
 # Activiteitgeschiedenis
 
diff --git a/resources/help_images/help.md b/resources/help_images/help.md
index bb33908..ebc90a0 100644
--- a/resources/help_images/help.md
+++ b/resources/help_images/help.md
@@ -2,7 +2,7 @@
 
 ## Login
 
-![](screenshots/help_login_page.png)
+![](direct/help_login_page.png)
 
 There are two options for connecting to your Babybuddy server:
 Enter your Babybuddy server URL, username, and password. Then press
@@ -40,56 +40,46 @@ will need to use the QR-code login option to login to such a server.
 
 ## Overview
 
-![](screenshots/help_overview.png)
+![](screenshots/help_overview_2.png)
 
 After logging in, you find buttons for logging activities in the upper part of the screen
 and a history of recently logged activities in the lower part of the screen.
 If you log activities for multiple children, you can swipe horizontally to switch between children.
 
-# Using Timers
+# Using Timer Logging
 
 ## Using Timers
 
 ![](direct/help_play_button_highlight.png)
 
-Press the "play"-button to start a timer for the listed activity.
+To start a timer, press any of the timer-event buttons in the upper part of the
+application. This will start a timer.
 
 ## Using Timers
 
-![](direct/help_notes_button_highlight.png)
+![](screenshots/help_timer_interface.png)
 
-While the timer is running, you can add notes by pressing the "notes" buttons.
+Starting a time will open an interface related to the timer that was just
+started. Fill in all the information you want to log. Once all required fields
+are entered a save-button will appear.
 
 ## Using Timers
 
 ![](direct/help_save_button_highlight.png)
 
-To stop the timer and store the activity, press the "save" button.
+Once the save-field appears, the timer can be stopped by pressing the 
+save-button. You can also click the timer-button top-row again to cancel a timer
+instead of saving it.
 
-## Feedings
+# Using Event Logging
 
-![](screenshots/help_feeding_form.png)
+## Logging Diapers and Notes
 
-Saving a feeding will trigger a second form, where the feeding type (e.g., solid food) and
-method must be entered before the feeding can be stored.
+![](screenshots/help_diaper_logging.png)
 
-## Other timers
-
-![](screenshots/help_timers_default.png)
-
-In a previous version of Babybuddy for Android, the app listed an arbitrary
-number of timers. Now, by default, only timers for the events that can be tracked
-by the app are visible. This was changed to achieve compatibility with
-Baby Buddy version 2.0.
-
-# Logging Diapers
-
-## Logging Diapers
-
-![](direct/help_save_diaper_highlight.png)
-
-The top controls allow logging of diaper changes. Select the type of diaper and press the
-"save" button to log the activity. You can optionally add notes.
+In addition to timer events the top-row allows logging of non-timer events, like
+diaper changes and generic notes. The controls function the same way as for the
+timer logging, but without a timer.
 
 # Event history
 
diff --git a/resources/help_images/screenshots/help_diaper_logging.png b/resources/help_images/screenshots/help_diaper_logging.png
new file mode 100644
index 0000000..e5e32bb
Binary files /dev/null and b/resources/help_images/screenshots/help_diaper_logging.png differ
diff --git a/resources/help_images/screenshots/help_events.png b/resources/help_images/screenshots/help_events.png
index ee9961e..044d56b 100644
Binary files a/resources/help_images/screenshots/help_events.png and b/resources/help_images/screenshots/help_events.png differ
diff --git a/resources/help_images/screenshots/help_feeding_form.png b/resources/help_images/screenshots/help_feeding_form.png
deleted file mode 100644
index 0bb3bc5..0000000
Binary files a/resources/help_images/screenshots/help_feeding_form.png and /dev/null differ
diff --git a/resources/help_images/screenshots/help_insecure_http.png b/resources/help_images/screenshots/help_insecure_http.png
deleted file mode 100644
index cb311aa..0000000
Binary files a/resources/help_images/screenshots/help_insecure_http.png and /dev/null differ
diff --git a/resources/help_images/screenshots/help_overview.png b/resources/help_images/screenshots/help_overview.png
deleted file mode 100644
index 11bcf46..0000000
Binary files a/resources/help_images/screenshots/help_overview.png and /dev/null differ
diff --git a/resources/help_images/screenshots/help_overview_2.png b/resources/help_images/screenshots/help_overview_2.png
new file mode 100644
index 0000000..00694a9
Binary files /dev/null and b/resources/help_images/screenshots/help_overview_2.png differ
diff --git a/resources/help_images/screenshots/help_timer_interface.png b/resources/help_images/screenshots/help_timer_interface.png
new file mode 100644
index 0000000..e0b6c68
Binary files /dev/null and b/resources/help_images/screenshots/help_timer_interface.png differ
diff --git a/resources/help_images/screenshots/help_timer_interface.xcf b/resources/help_images/screenshots/help_timer_interface.xcf
new file mode 100644
index 0000000..35f0aa7
Binary files /dev/null and b/resources/help_images/screenshots/help_timer_interface.xcf differ
diff --git a/resources/help_images/screenshots/help_timers_default.png b/resources/help_images/screenshots/help_timers_default.png
deleted file mode 100644
index 4457fd5..0000000
Binary files a/resources/help_images/screenshots/help_timers_default.png and /dev/null differ
diff --git a/resources/store-listing/phone-screenshots/diaper.png b/resources/store-listing/phone-screenshots/diaper.png
index 6574976..624c6f9 100644
Binary files a/resources/store-listing/phone-screenshots/diaper.png and b/resources/store-listing/phone-screenshots/diaper.png differ
diff --git a/resources/store-listing/phone-screenshots/feeding.png b/resources/store-listing/phone-screenshots/feeding.png
index 0bb3bc5..f084436 100644
Binary files a/resources/store-listing/phone-screenshots/feeding.png and b/resources/store-listing/phone-screenshots/feeding.png differ
diff --git a/resources/store-listing/phone-screenshots/overview.png b/resources/store-listing/phone-screenshots/overview.png
index 684e140..05a05e5 100644
Binary files a/resources/store-listing/phone-screenshots/overview.png and b/resources/store-listing/phone-screenshots/overview.png differ
diff --git a/resources/store-listing/phone-screenshots/timer.png b/resources/store-listing/phone-screenshots/timer.png
index a17632f..d29a2e5 100644
Binary files a/resources/store-listing/phone-screenshots/timer.png and b/resources/store-listing/phone-screenshots/timer.png differ
diff --git a/tools/babybuddy-version-array/versions b/tools/babybuddy-version-array/versions
index 72df637..b2813ac 100644
--- a/tools/babybuddy-version-array/versions
+++ b/tools/babybuddy-version-array/versions
@@ -1,3 +1,5 @@
+v2.6.0
+v2.5.0
 v2.3.0
 v2.2.1
 v2.1.2