diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10010640..f3de56d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,35 +1,49 @@
+## 1.4.0
+
+* added support for collection of health data from Apple Health or Google Health Connect
+* fixed a number of issues related to;
+  * on-boarding flow
+  * user authentication
+  * using the Polar device
+
 ## 1.2.0
-Fix a bunch of issues in the app stemming from 1.1 and 1.0.
+
+* fixed a bunch of issues in the app stemming from 1.1 and 1.0.
 
 ## 0.23.0
-* Track iOS version numbering.
 
-* This version adds a heart rate visualisation with a Polar device and created a Continous integration pipeline for iOS deployment.
-* Also fixed some visual issues in the devices page.
+* track iOS version numbering.
+* this version adds a heart rate visualisation with a Polar device and created a Continous integration pipeline for iOS deployment.
+* fixed some visual issues in the devices page.
 
 ## 0.40.0
+
 * upgrade to `carp_mobile_sensing` v 0.40.0
 
 ## 0.32.1
+
 * server-side messaging
 
 ## 0.32.0
+
 * upgrade to `carp_mobile_sensing` v. 0.32.x
 * fix of
-    * https://trello.com/c/qFZxo4Ws/110-sensing-is-not-started-on-app-restart
-    * https://trello.com/c/eu99YxlD/108-too-much-text-in-location-pop-up-no-translation-to-danish
-    * https://trello.com/c/8DWHufIU/105-translation-of-notifications
+  * <https://trello.com/c/qFZxo4Ws/110-sensing-is-not-started-on-app-restart>
+  * <https://trello.com/c/eu99YxlD/108-too-much-text-in-location-pop-up-no-translation-to-danish>
+  * <https://trello.com/c/8DWHufIU/105-translation-of-notifications>
 * **note** that the app needs to be deleted and re-installed, if language is changed (need to download the study protocol instead of using the cached one)
 
-
 ## 0.21.0
+
 * upgrade to `carp_mobile_sensing` v. 0.22.x
 * support for downloading study protocol, informed consent, and localization from CARP
 
 ## 0.20.0
+
 * upgrade to `carp_mobile_sensing` v. 0.20.x
 
 ## 0.1.0
+
 * basic architecture
 * basic UX
 * support for simple sensing
diff --git a/README.md b/README.md
index 40f03b70..40064e2b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-# CARP Study App
-The CARP Study App is designed to run generic studies using the [CARP Mobile Sensing](https://pub.dev/packages/carp_mobile_sensing) 
-(CAMS) Framework, which is part of the [CACHET Research Platform](https://carp.cachet.dk) (CARP) 
-from the [Copenhagen Center for Health Technology](https://www.cachet.dk).
+# CARP Studies App
 
-It follows the Flutter Business Logic Component (BLoC) architecture, as described in the 
-[CARP Mobile Sensing Demo App](https://github.com/cph-cachet/carp.sensing-flutter/tree/master/apps/carp_mobile_sensing_app).
+The CARP Studies App is designed to run generic studies using the [CARP Mobile Sensing](https://pub.dev/packages/carp_mobile_sensing) (CAMS) Framework, which is part of the [Copenhagen Research Platform](https://carp.cachet.dk) (CARP) from the [Department of Health Technology](https://www.healthtech.dtu.dk/) at the Technical University of Denmark.
+
+It follows a basic Business Logic Component (BLoC) combined with a Model-View-View-Model architecture, as described in the [CARP Mobile Sensing Demo App](https://github.com/cph-cachet/carp.sensing-flutter/tree/master/apps/carp_mobile_sensing_app).
+
+Read more about the [CARP Studies app](https://carp.cachet.dk/carp-studies-app/) on the CARP Homepage.
diff --git a/analysis_options.yaml b/analysis_options.yaml
index 61b6c4de..b449163e 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,29 +1,18 @@
-# This file configures the analyzer, which statically analyzes Dart code to
-# check for errors, warnings, and lints.
-#
-# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
-# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
-# invoked from the command line by running `flutter analyze`.
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options
+
+include: package:lints/recommended.yaml
 
-# The following line activates a set of recommended lints for Flutter apps,
-# packages, and plugins designed to encourage good coding practices.
-include: package:flutter_lints/flutter.yaml
+analyzer:
+  exclude: [build/**]
+  language:
+    strict-casts: true
+    strict-inference: true
+    strict-raw-types: true    
 
 linter:
-  # The lint rules applied to this project can be customized in the
-  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
-  # included above or to enable additional rules. A list of all available lints
-  # and their documentation is published at
-  # https://dart-lang.github.io/linter/lints/index.html.
-  #
-  # Instead of disabling a lint rule for the entire project in the
-  # section below, it can also be suppressed for a single line of code
-  # or a specific dart file by using the `// ignore: name_of_lint` and
-  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
-  # producing the lint.
   rules:
-    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
-    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
-
-# Additional information about this file can be found at
-# https://dart.dev/guides/language/analysis-options
+    cancel_subscriptions: true
+    constant_identifier_names: false
+    depend_on_referenced_packages: false
+    use_string_in_part_of_directives: false
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 79ef3089..c4cf5f11 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -48,7 +48,14 @@
         android:maxSdkVersion="28" />
 
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+
+    <!-- for Android 9 (API 28 and below), use: -->
+    <uses-permission 
+        android:name="com.google.android.gms.permission.ACTIVITY_RECOGNITION" 
+        android:maxSdkVersion="28" />
+    <!-- for Android 10 (API 29 and later), use: -->
     <uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" />
+
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -57,48 +64,6 @@
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.CAMERA" />
 
-    <!-- Permissions for Health Connect API -->
-    <uses-permission android:name="android.permission.health.READ_STEPS"/>
-    <uses-permission android:name="android.permission.health.WRITE_STEPS"/>
-    <uses-permission android:name="android.permission.health.READ_WEIGHT"/>
-    <uses-permission android:name="android.permission.health.WRITE_WEIGHT"/>
-    <uses-permission android:name="android.permission.health.READ_HEIGHT"/>
-    <uses-permission android:name="android.permission.health.WRITE_HEIGHT"/>
-    <uses-permission android:name="android.permission.health.READ_HEART_RATE"/>
-    <uses-permission android:name="android.permission.health.WRITE_HEART_RATE"/>
-    <uses-permission android:name="android.permission.health.READ_EXERCISE"/>
-    <uses-permission android:name="android.permission.health.WRITE_EXERCISE"/>
-    <uses-permission android:name="android.permission.health.READ_SLEEP"/>
-    <uses-permission android:name="android.permission.health.WRITE_SLEEP"/>
-    <uses-permission android:name="android.permission.health.READ_SPEED"/>
-    <uses-permission android:name="android.permission.health.WRITE_SPEED"/>
-    <uses-permission android:name="android.permission.health.READ_DISTANCE"/>
-    <uses-permission android:name="android.permission.health.WRITE_DISTANCE"/>
-    <uses-permission android:name="android.permission.health.READ_TOTAL_CALORIES_BURNED"/>
-    <uses-permission android:name="android.permission.health.WRITE_TOTAL_CALORIES_BURNED"/>
-    <uses-permission android:name="android.permission.health.READ_ACTIVE_CALORIES_BURNED"/>
-    <uses-permission android:name="android.permission.health.WRITE_ACTIVE_CALORIES_BURNED"/>
-    <uses-permission android:name="android.permission.health.READ_BLOOD_GLUCOSE"/>
-    <uses-permission android:name="android.permission.health.WRITE_BLOOD_GLUCOSE"/>
-    <uses-permission android:name="android.permission.health.READ_BLOOD_PRESSURE"/>
-    <uses-permission android:name="android.permission.health.WRITE_BLOOD_PRESSURE"/>
-    <uses-permission android:name="android.permission.health.READ_BODY_FAT"/>
-    <uses-permission android:name="android.permission.health.WRITE_BODY_FAT"/>
-    <uses-permission android:name="android.permission.health.READ_BODY_TEMPERATURE"/>
-    <uses-permission android:name="android.permission.health.WRITE_BODY_TEMPERATURE"/>
-    <uses-permission android:name="android.permission.health.READ_OXYGEN_SATURATION"/>
-    <uses-permission android:name="android.permission.health.WRITE_OXYGEN_SATURATION"/>
-    <uses-permission android:name="android.permission.health.READ_HYDRATION"/>
-    <uses-permission android:name="android.permission.health.WRITE_HYDRATION"/>
-    <uses-permission android:name="android.permission.health.READ_RESTING_HEART_RATE"/>
-    <uses-permission android:name="android.permission.health.WRITE_RESTING_HEART_RATE"/>
-    <uses-permission android:name="android.permission.health.WRITE_FLOORS_CLIMBED"/>
-    <uses-permission android:name="android.permission.health.READ_FLOORS_CLIMBED"/>
-    <uses-permission android:name="android.permission.health.WRITE_BASAL_METABOLIC_RATE"/>
-    <uses-permission android:name="android.permission.health.READ_BASAL_METABOLIC_RATE"/>
-    <uses-permission android:name="android.permission.health.READ_RESPIRATORY_RATE"/>
-    <uses-permission android:name="android.permission.health.WRITE_RESPIRATORY_RATE"/>
-
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
          In most cases you can leave this as-is, but you if you want to provide
diff --git a/assets/lang/da.json b/assets/lang/da.json
index 80866b27..d3f4583a 100644
--- a/assets/lang/da.json
+++ b/assets/lang/da.json
@@ -141,5 +141,5 @@
     "widgets.logoutmessage.cancel": "Annuller",
     "widgets.logoutmessage.okay": "Okay",
     "pages.login.login": "Log ind",
-    "pages.login.endsession": "Afslut log ind session"
+    "pages.login.logout": "Log ud"
 }
\ No newline at end of file
diff --git a/assets/lang/en.json b/assets/lang/en.json
index 6d5bcd38..05de9d82 100644
--- a/assets/lang/en.json
+++ b/assets/lang/en.json
@@ -142,5 +142,5 @@
     "widgets.logoutmessage.cancel": "Cancel",
     "widgets.logoutmessage.okay": "Okay",
     "pages.login.login": "Log in",
-    "pages.login.endsession": "End login session"
+    "pages.login.logout": "Logout"
 }
\ No newline at end of file
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 9e8a55be..8fb1a470 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -42,9 +42,6 @@ PODS:
   - flutter_sound_core (9.2.13)
   - flutter_timezone (0.0.1):
     - Flutter
-  - FMDB (2.7.5):
-    - FMDB/standard (= 2.7.5)
-  - FMDB/standard (2.7.5)
   - health (1.0.4):
     - Flutter
   - just_audio (0.0.1):
@@ -83,7 +80,7 @@ PODS:
     - FlutterMacOS
   - sqflite (0.0.3):
     - Flutter
-    - FMDB (>= 2.7.5)
+    - FlutterMacOS
   - SwiftProtobuf (1.25.2)
   - url_launcher_ios (0.0.1):
     - Flutter
@@ -122,7 +119,7 @@ DEPENDENCIES:
   - screen_state (from `.symlinks/plugins/screen_state/ios`)
   - sensors_plus (from `.symlinks/plugins/sensors_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
-  - sqflite (from `.symlinks/plugins/sqflite/ios`)
+  - sqflite (from `.symlinks/plugins/sqflite/darwin`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
   - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`)
 
@@ -131,7 +128,6 @@ SPEC REPOS:
     - AppAuth
     - ESense
     - flutter_sound_core
-    - FMDB
     - PolarBleSdk
     - ReachabilitySwift
     - RxSwift
@@ -199,7 +195,7 @@ EXTERNAL SOURCES:
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
   sqflite:
-    :path: ".symlinks/plugins/sqflite/ios"
+    :path: ".symlinks/plugins/sqflite/darwin"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
   video_player_avfoundation:
@@ -225,7 +221,6 @@ SPEC CHECKSUMS:
   flutter_sound: c60effa2a350fb977885f0db2fbc4c1ad5160900
   flutter_sound_core: 26c10e5832e76aaacfae252d8925232281c486ae
   flutter_timezone: ffb07bdad3c6276af8dada0f11978d8a1f8a20bb
-  FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   health: 5a380c0f6c4f619535845992993964293962e99e
   just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa
   light: 86af7a847d218a9a2376bc1c1ae40c3410441135
@@ -243,7 +238,7 @@ SPEC CHECKSUMS:
   screen_state: a7ae251997e97f3f001839df09b57313b0ddef18
   sensors_plus: 42b9de1b8237675fa8d8121e4bb93be0f79fa61d
   shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
-  sqflite: 50a33e1d72bd59ee092a519a35d107502757ebed
+  sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
   SwiftProtobuf: 407a385e97fd206c4fbe880cc84123989167e0d1
   url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812
   video_player_avfoundation: 02011213dab73ae3687df27ce441fbbcc82b5579
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 736db306..9c3f8d35 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -397,7 +397,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.2;
+				MARKETING_VERSION = 1.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cachet.carpstudyapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -554,7 +554,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.2;
+				MARKETING_VERSION = 1.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cachet.carpstudyapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -597,7 +597,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.2;
+				MARKETING_VERSION = 1.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cachet.carpstudyapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/lib/blocs/app_bloc.dart b/lib/blocs/app_bloc.dart
index db9b3647..ef8ad0e0 100644
--- a/lib/blocs/app_bloc.dart
+++ b/lib/blocs/app_bloc.dart
@@ -1,30 +1,50 @@
-part of '../main.dart';
+part of carp_study_app;
 
+/// The state of the [StudyAppBLoC].
 enum StudyAppState {
-  /// The BLOC is created (initial state)
+  /// The BLoC is created but not ready for use.
   created,
 
-  /// The BLOC is initialized via the [initialized] method.
+  /// The BLoC is initialized via the [initialized] method.
   initialized,
 
-  /// The BLOC is in the process of being configured.
+  /// The BLoC is in the process of being configured with a study.
   configuring,
 
-  /// The BLOC is configured and ready to use.
+  /// The BLoC is configured with a study and ready to use.
   configured,
 }
 
-class StudyAppBLoC {
+/// How to deploy a study.
+enum DeploymentMode {
+  /// Use a local study protocol & deployment and store data locally on the phone.
+  local,
+
+  /// Use the CAWS production server to get the study deployment and store data.
+  production,
+
+  /// Use the CAWS staging server to get the study deployment and store data.
+  staging,
+
+  /// Use the CAWS test server to get the study deployment and store data.
+  test,
+
+  /// Use the CAWS development server to get the study deployment and store data.
+  dev,
+}
+
+/// The main Business Logic Component (BLoC) for the entire app.
+///
+/// Works as a singleton and can always be accessed via the global `bloc`
+/// variable.
+///
+/// Works as a [ChangeNotifier] and will notify its listeners on important
+/// changes. Is also stateful and has a [state] and state changes are propagated
+/// through the [stateStream].
+class StudyAppBLoC extends ChangeNotifier {
   StudyAppState _state = StudyAppState.created;
   final CarpBackend _backend = CarpBackend();
   final CarpStudyAppViewModel _appViewModel = CarpStudyAppViewModel();
-  StudyDeploymentStatus? _status;
-  final StreamController<StudiesAppState> _stateStream =
-      StreamController.broadcast();
-
-  get stateStream => _stateStream;
-
-  List<ActiveParticipationInvitation> invitations = [];
 
   List<Message> _messages = [];
   final StreamController<int> _messageStreamController =
@@ -35,7 +55,9 @@ class StudyAppBLoC {
   /// The data send on the stream is the number of available messages.
   Stream<int> get messageStream => _messageStreamController.stream;
 
+  /// The state of this BloC.
   StudyAppState get state => _state;
+
   bool get isInitialized => _state.index >= 1;
   bool get isConfiguring => _state.index >= 2;
   bool get isConfigured => _state.index >= 3;
@@ -43,17 +65,17 @@ class StudyAppBLoC {
   /// Debug level for the app and CAMS.
   DebugLevel debugLevel;
 
-  /// What kind of deployment are we running - dev, staging, test or production?
+  /// What kind of deployment are we running?
   final DeploymentMode deploymentMode;
 
   // ScaffoldMessenger for showing snack bars
   final _scaffoldKey = GlobalKey<ScaffoldMessengerState>();
-  get scaffoldKey => _scaffoldKey;
-  get scaffoldMessengerState => scaffoldKey.currentState;
+  GlobalKey<ScaffoldMessengerState> get scaffoldKey => _scaffoldKey;
+  State? get scaffoldMessengerState => scaffoldKey.currentState;
 
   /// Create the BLoC for the app specifying:
   ///  * debug level
-  ///  * deployment mode (production, test, dev)
+  ///  * deployment mode (production, test, dev, local)
   StudyAppBLoC({
     this.debugLevel = DebugLevel.info,
     this.deploymentMode = DeploymentMode.dev,
@@ -72,38 +94,31 @@ class StudyAppBLoC {
   /// Typical set based on an invitation.
   /// `null` if no deployment have been specified.
   String? get studyId => LocalSettings().studyId;
-  set studyId(String? id) {
-    LocalSettings().studyId = id;
-    backend.studyId = id;
-  }
+  set studyId(String? id) => LocalSettings().studyId = id;
 
   /// The id of the currently running study deployment.
   /// Typical set based on an invitation.
   /// `null` if no deployment have been specified.
   String? get studyDeploymentId => LocalSettings().studyDeploymentId;
-  set studyDeploymentId(String? id) {
-    LocalSettings().studyDeploymentId = id;
-    backend.studyDeploymentId = id;
-  }
+  set studyDeploymentId(String? id) => LocalSettings().studyDeploymentId = id;
 
   /// The role name of the device in the currently running study deployment.
   /// Typical set based on an invitation.
   /// `null` if no deployment have been specified.
-  String? get deviceRolename => LocalSettings().deviceRolename;
-  set deviceRolename(String? name) => LocalSettings().deviceRolename = name;
+  String? get deviceRoleName => LocalSettings().deviceRoleName;
+  set deviceRoleName(String? name) => LocalSettings().deviceRoleName = name;
+
+  /// Has a study already been deployed on this phone?
+  bool get hasStudyBeenDeployed => studyDeploymentId != null;
 
   /// The deployment running on this phone.
   SmartphoneDeployment? get deployment => Sensing().controller?.deployment;
 
-  /// Get the latest status of the study deployment.
-  StudyDeploymentStatus? get status => _status;
-
   /// When was this study deployed on this phone.
   DateTime? get studyStartTimestamp => deployment?.deployed;
 
   /// The overall data model for this app
   CarpStudyAppViewModel get appViewModel => _appViewModel;
-  // Future<void>? dataPageInitialization;
 
   /// Initialize this BLOC. Called before being used for anything.
   Future<void> initialize() async {
@@ -115,26 +130,34 @@ class StudyAppBLoC {
 
     await backend.initialize();
 
-    stateStream.sink.add(StudiesAppState.initialized);
-    info('$runtimeType initialized.');
+    _state = StudyAppState.initialized;
+    notifyListeners();
+    debug('$runtimeType initialized.');
   }
 
   /// Set the active study in the app based on an [invitation].
   ///
-  /// If the [context] is provided, the translation for this study is re-loaded
+  /// If a [context] is provided, the translation for this study is re-loaded
   /// and applied in the app.
   void setStudyInvitation(
     ActiveParticipationInvitation invitation, [
     BuildContext? context,
   ]) {
-    bloc.studyId = invitation.studyId;
-    bloc.studyDeploymentId = invitation.studyDeploymentId;
-    bloc.deviceRolename = invitation.assignedDevices?.first.device.roleName;
+    studyId = invitation.studyId;
+    studyDeploymentId = invitation.studyDeploymentId;
+    deviceRoleName = invitation.assignedDevices?.first.device.roleName;
+
+    // make sure that the app is configured with the study IDs in order to access
+    // the correct resources (like translations etc.) on CAWS.
+    backend.app?.studyId = studyId;
+    backend.app?.studyDeploymentId = studyDeploymentId;
+
+    notifyListeners();
 
     info('Invitation received - '
         'study id: ${bloc.studyId}, '
         'deployment id: ${bloc.studyDeploymentId}, '
-        'role name: ${bloc.deviceRolename}');
+        'role name: ${bloc.deviceRoleName}');
 
     if (context != null) CarpStudyApp.reloadLocale(context);
   }
@@ -148,7 +171,7 @@ class StudyAppBLoC {
     // early out if already configured
     if (isConfiguring) return;
 
-    stateStream.sink.add(StudiesAppState.configuring);
+    _state = StudyAppState.configuring;
 
     // set up and initialize sensing
     await Sensing().initialize();
@@ -159,8 +182,6 @@ class StudyAppBLoC {
     // initialize the UI data models
     appViewModel.init(Sensing().controller!);
 
-    debug('$runtimeType - done init() of view model');
-
     // set up the messaging part
     messageManager.initialize().then(
       (value) {
@@ -170,7 +191,8 @@ class StudyAppBLoC {
       },
     );
 
-    debug('$runtimeType configuration done.');
+    info('$runtimeType - Study configuration done.');
+    notifyListeners();
     _state = StudyAppState.configured;
   }
 
@@ -181,7 +203,7 @@ class StudyAppBLoC {
           permission == Permission.locationWhenInUse ||
           permission == Permission.locationAlways);
 
-  /// Configuration of permissions.
+  /// Configuration of location permissions.
   ///
   /// If a [context] is provided, this method also opens the [LocationUsageDialog]
   /// if location permissions are needed and not yet granted.
@@ -229,15 +251,16 @@ class StudyAppBLoC {
       _messages = await messageManager.getMessages();
       _messages.sort((m1, m2) => m1.timestamp.compareTo(m2.timestamp));
       info('Message list refreshed - count: ${_messages.length}');
-      _messageStreamController.add(_messages.length);
     } catch (error) {
       warning('Error getting messages - $error');
     }
+    _messageStreamController.add(_messages.length);
   }
 
   /// The signed in user. Returns null if no user is signed in.
   CarpUser? get user => backend.user;
 
+  /// The username of the user running this study.
   String get username => (user != null)
       ? user!.username
       : Sensing().controller!.deployment!.userId!;
@@ -269,7 +292,7 @@ class StudyAppBLoC {
   }
 
   /// Does this [deployment] have any user tasks?
-  bool hasSurveys() => (deployment == null)
+  bool hasUserTasks() => (deployment == null)
       ? false
       : deployment!.tasks.whereType<AppTask>().isNotEmpty;
 
@@ -286,8 +309,8 @@ class StudyAppBLoC {
       : [];
 
   /// Get a list of running devices
-  Iterable<DeviceModel> get runningDevices =>
-      Sensing().runningDevices!.map((device) => DeviceModel(device));
+  Iterable<DeviceViewModel> get runningDevices =>
+      Sensing().runningDevices!.map((device) => DeviceViewModel(device));
 
   /// Start sensing.
   Future<void> start() async {
@@ -296,11 +319,15 @@ class StudyAppBLoC {
     if (!Sensing().isRunning) Sensing().controller?.start();
   }
 
-  // Stop sensing.
+  /// Stop sensing.
   void stop() => Sensing().controller?.executor.stop();
 
-  // Dispose the entire sensing.
-  void dispose() => Sensing().controller?.dispose();
+  /// Dispose the entire sensing.
+  @override
+  void dispose() {
+    super.dispose();
+    Sensing().controller?.dispose();
+  }
 
   /// Add a [Measurement] object to the stream of events.
   void addMeasurement(Measurement measurement) =>
@@ -327,6 +354,7 @@ class StudyAppBLoC {
     hasInformedConsentBeenAccepted = false;
     await LocalSettings().eraseStudyIds();
     await Sensing().removeStudy();
+    notifyListeners();
   }
 
   /// Leave the study and also sign out the user.
@@ -337,5 +365,6 @@ class StudyAppBLoC {
   Future<void> leaveStudyAndSignOut() async {
     await leaveStudy();
     await backend.signOut();
+    notifyListeners();
   }
 }
diff --git a/lib/blocs/common.dart b/lib/blocs/common.dart
deleted file mode 100644
index 2dd6a144..00000000
--- a/lib/blocs/common.dart
+++ /dev/null
@@ -1,61 +0,0 @@
-part of '../main.dart';
-
-/// Enumeration of different types of deployments on the CARP Web Service (CAWS).
-enum DeploymentMode {
-  /// Use the CARP production server to get the study deployment and store data.
-  production,
-
-  /// Use the CARP staging server to get the study deployment and store data.
-  staging,
-
-  /// Use the CARP testing server to get the study deployment and store data.
-  test,
-
-  /// Use the CARP development server to get the study deployment and store data.
-  dev,
-}
-
-/// Enumeration of of different user authentication states.
-enum LoginStatus {
-  /// No invitation selected (tap outside the invitation box).
-  /// Navigate to login screen.
-  noSelection,
-
-  /// Informed Consent not accepted.
-  /// Navigate to message screen or login.
-  noConsent,
-
-  /// User registered but no current ongoing studies.
-  /// Navigate to message screen.
-  noInvitation,
-
-  /// User temporary blocked based on 3 wrongly login credentials.
-  /// Navigate to message screen.
-  temporaryBlock,
-
-  /// Successful login.
-  /// Navigate to home page.
-  successful,
-}
-
-enum ProcessStatus {
-  done,
-  error,
-  other,
-}
-
-/// Enumeration of different app states.
-enum StudiesAppState {
-  initialized,
-  authenticating,
-  accessTokenRetrieved,
-  configuring,
-  loading,
-  loaded,
-  error,
-}
-
-extension StringExtension on String {
-  String truncateTo(int maxLength) =>
-      (length <= maxLength) ? this : '${substring(0, maxLength)}...';
-}
diff --git a/lib/sensing/sensing.dart b/lib/blocs/sensing.dart
similarity index 97%
rename from lib/sensing/sensing.dart
rename to lib/blocs/sensing.dart
index eee84ac6..3764cbcf 100644
--- a/lib/sensing/sensing.dart
+++ b/lib/blocs/sensing.dart
@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-part of '../main.dart';
+part of carp_study_app;
 
 /// This class implements the sensing layer.
 ///
@@ -37,7 +37,7 @@ class Sensing {
   StudyDeploymentStatus? get status => _status;
 
   /// The role name of this device in the deployed study.
-  String? get deviceRolename => _study?.deviceRoleName;
+  String? get deviceRoleName => _study?.deviceRoleName;
 
   /// The study deployment id of the deployment running on this phone.
   String? get studyDeploymentId => _study?.studyDeploymentId;
@@ -68,7 +68,7 @@ class Sensing {
     //SamplingPackageRegistry.register(CommunicationSamplingPackage());
     SamplingPackageRegistry().register(MediaSamplingPackage());
     SamplingPackageRegistry().register(SurveySamplingPackage());
-    SamplingPackageRegistry().register(HealthSamplingPackage());
+    //SamplingPackageRegistry.register(HealthSamplingPackage());
     SamplingPackageRegistry().register(ESenseSamplingPackage());
     SamplingPackageRegistry().register(PolarSamplingPackage());
 
@@ -115,7 +115,7 @@ class Sensing {
     // Define the study and add it to the client.
     _study = await SmartPhoneClientManager().addStudy(
       bloc.studyDeploymentId!,
-      bloc.deviceRolename!,
+      bloc.deviceRoleName!,
     );
 
     // Get the study controller and try to deploy the study.
diff --git a/lib/blocs/util.dart b/lib/blocs/util.dart
new file mode 100644
index 00000000..b23a231c
--- /dev/null
+++ b/lib/blocs/util.dart
@@ -0,0 +1,6 @@
+part of carp_study_app;
+
+extension StringExtension on String {
+  String truncateTo(int maxLength) =>
+      (length <= maxLength) ? this : '${substring(0, maxLength)}...';
+}
diff --git a/lib/carp_study_app.dart b/lib/carp_study_app.dart
index 50b9fd2b..4647ac9b 100644
--- a/lib/carp_study_app.dart
+++ b/lib/carp_study_app.dart
@@ -1,8 +1,7 @@
-part of 'main.dart';
+part of carp_study_app;
 
 final _rootNavigatorKey = GlobalKey<NavigatorState>();
 final _shellNavigatorKey = GlobalKey<NavigatorState>();
-const String firstRoute = '/about';
 
 class CarpStudyApp extends StatefulWidget {
   const CarpStudyApp({super.key});
@@ -18,12 +17,14 @@ class CarpStudyApp extends StatefulWidget {
 }
 
 class CarpStudyAppState extends State<CarpStudyApp> {
-  reloadLocale() {
-    setState(() {
-      rpLocalizationsDelegate.reload();
-    });
-  }
+  /// The landing page once the onboarding process is done.
+  static const String firstRoute = StudyPage.route;
+
+  /// Reload language translations and re-build the entire app.
+  void reloadLocale() => setState(() => rpLocalizationsDelegate.reload());
 
+  // This create the routing in the entire app.
+  // Each page (like [LoginPage]) know the name of its own route.
   final GoRouter _router = GoRouter(
     initialLocation: '/',
     navigatorKey: _rootNavigatorKey,
@@ -34,37 +35,45 @@ class CarpStudyAppState extends State<CarpStudyApp> {
         builder: (BuildContext context, GoRouterState state, Widget child) =>
             HomePage(child: child),
         routes: [
+          // This is the root route, handling the onboarding. Checks if;
+          //  - the user is authenticated, if not show login page
+          //  - a study is deployed, if not show list of invitations for the user
+          //  - the user has accepted the informed consent, if not show informed consent page
+          //
+          // Once the above is done, then show the "first route", which currently is
+          // the "study" information page.
           GoRoute(
-            path: '/',
-            parentNavigatorKey: _shellNavigatorKey,
-            redirect: (context, state) => !CarpService().authenticated
-                ? '/login'
-                : (bloc.hasInformedConsentBeenAccepted
-                    ? firstRoute
-                    : '/consent'),
-          ),
+              path: '/',
+              parentNavigatorKey: _shellNavigatorKey,
+              redirect: (context, state) => (!bloc.backend.isAuthenticated)
+                  ? LoginPage.route
+                  : (!bloc.hasStudyBeenDeployed)
+                      ? InvitationListPage.route
+                      : (!bloc.hasInformedConsentBeenAccepted)
+                          ? InformedConsentPage.route
+                          : firstRoute),
           GoRoute(
-            path: '/tasks',
+            path: TaskListPage.route,
             parentNavigatorKey: _shellNavigatorKey,
             pageBuilder: (context, state) => CustomTransitionPage(
               child: TaskListPage(
-                bloc.appViewModel.taskListPageViewModel,
+                model: bloc.appViewModel.taskListPageViewModel,
               ),
               transitionsBuilder: bottomNavigationBarAnimation,
             ),
           ),
           GoRoute(
-            path: '/about',
+            path: StudyPage.route,
             parentNavigatorKey: _shellNavigatorKey,
             pageBuilder: (context, state) => CustomTransitionPage(
               child: StudyPage(
-                bloc.appViewModel.studyPageViewModel,
+                model: bloc.appViewModel.studyPageViewModel,
               ),
               transitionsBuilder: bottomNavigationBarAnimation,
             ),
           ),
           GoRoute(
-            path: '/data',
+            path: DataVisualizationPage.route,
             parentNavigatorKey: _shellNavigatorKey,
             pageBuilder: (context, state) => CustomTransitionPage(
               child: DataVisualizationPage(
@@ -73,15 +82,15 @@ class CarpStudyAppState extends State<CarpStudyApp> {
             ),
           ),
           GoRoute(
-            path: '/devices',
+            path: DeviceListPage.route,
             parentNavigatorKey: _shellNavigatorKey,
             pageBuilder: (context, state) => const CustomTransitionPage(
-              child: DevicesPage(),
+              child: DeviceListPage(),
               transitionsBuilder: bottomNavigationBarAnimation,
             ),
           ),
           GoRoute(
-            path: '/profile',
+            path: ProfilePage.route,
             parentNavigatorKey: _shellNavigatorKey,
             pageBuilder: (context, state) => CustomTransitionPage(
               child: ProfilePage(bloc.appViewModel.profilePageViewModel),
@@ -91,9 +100,11 @@ class CarpStudyAppState extends State<CarpStudyApp> {
         ],
       ),
       GoRoute(
-        path: '/studyDetails',
+        path: StudyDetailsPage.route,
         parentNavigatorKey: _rootNavigatorKey,
-        builder: (context, state) => StudyDetailsPage(),
+        builder: (context, state) => StudyDetailsPage(
+          model: bloc.appViewModel.studyPageViewModel,
+        ),
       ),
       GoRoute(
         path: '/task/:taskId',
@@ -105,41 +116,42 @@ class CarpStudyAppState extends State<CarpStudyApp> {
         },
       ),
       GoRoute(
-        path: '/consent',
+        path: InformedConsentPage.route,
         parentNavigatorKey: _rootNavigatorKey,
         redirect: (context, state) => bloc.hasInformedConsentBeenAccepted
             ? firstRoute
-            : (bloc.studyId == null ? '/invitations' : null),
+            : (bloc.studyId == null ? InvitationListPage.route : null),
         builder: (context, state) => InformedConsentPage(
-          bloc.appViewModel.informedConsentViewModel,
+          model: bloc.appViewModel.informedConsentViewModel,
         ),
       ),
       GoRoute(
-        path: '/login',
+        path: LoginPage.route,
         parentNavigatorKey: _rootNavigatorKey,
         builder: (context, state) => const LoginPage(),
       ),
       GoRoute(
-        path: '/message/:messageId',
+        path: '${MessageDetailsPage.route}/:messageId',
         parentNavigatorKey: _rootNavigatorKey,
         builder: (context, state) => MessageDetailsPage(
             messageId: state.pathParameters['messageId'] ?? ''),
       ),
       GoRoute(
-        path: '/invitation/:invitationId',
+        path: '${InvitationDetailsPage.route}/:invitationId',
         parentNavigatorKey: _rootNavigatorKey,
         builder: (context, state) => InvitationDetailsPage(
+          model: bloc.appViewModel.invitationsListViewModel,
           invitationId: state.pathParameters['invitationId'] ?? '',
         ),
       ),
       GoRoute(
-        path: '/invitations',
+        path: InvitationListPage.route,
         parentNavigatorKey: _rootNavigatorKey,
         redirect: (context, state) => bloc.studyId != null
-            ? '/consent'
-            : (bloc.user == null ? '/login' : null),
-        builder: (context, state) =>
-            InvitationListPage(bloc.appViewModel.invitationsListViewModel),
+            ? InformedConsentPage.route
+            : (bloc.user == null ? LoginPage.route : null),
+        builder: (context, state) => InvitationListPage(
+            model: bloc.appViewModel.invitationsListViewModel),
       ),
     ],
     debugLogDiagnostics: true,
diff --git a/lib/data/carp_backend.dart b/lib/data/carp_backend.dart
index c98b5f99..d7b6af14 100644
--- a/lib/data/carp_backend.dart
+++ b/lib/data/carp_backend.dart
@@ -1,14 +1,18 @@
-part of '../main.dart';
+part of carp_study_app;
 
+/// Handles a connection to the CAWS backend, including configuring the CAWS [app],
+/// authentication, storing study IDs, and uploading informed consent.
+///
+/// Use as a singleton ` CarpBackend()`.
 class CarpBackend {
   /// The URI of the CARP Web Service (CAWS) host.
-  static const String cawsUri = "https://cans.cachet.dk";
+  static const String cawsUri = 'carp.computerome.dk';
 
   /// The URL of the CARP Privacy Policy for this app.
   static const String carpPrivacyUrl =
       "https://carp.cachet.dk/privacy-policy-app";
 
-  /// The URL of the official CARP Web Site.
+  /// The URL of the official CARP web site.
   static const String carpWebsiteUrl = "https://carp.cachet.dk";
 
   static const Map<DeploymentMode, String> uris = {
@@ -19,20 +23,17 @@ class CarpBackend {
   };
 
   static final CarpBackend _instance = CarpBackend._();
-
-  String get clientId => "carp";
-  String get clientSecret => "carp";
-
-  /// The CAWS app configuration.
-  CarpApp? app;
-
-  /// Has the user been authenticated?
-  bool get isAuthenticated => CarpService().authenticated;
+  factory CarpBackend() => _instance;
+  CarpBackend._() : super() {
+    // make sure that the json functions are loaded
+    CarpMobileSensing.ensureInitialized();
+    CognitionPackage.ensureInitialized();
+  }
 
   /// The URI of the CANS server - depending on deployment mode.
   Uri get uri => Uri(
         scheme: 'https',
-        host: 'carp.computerome.dk',
+        host: cawsUri,
         pathSegments: [
           'auth',
           uris[bloc.deploymentMode]!,
@@ -41,31 +42,13 @@ class CarpBackend {
         ],
       );
 
-  CarpUser? get user => LocalSettings().user;
-  set user(CarpUser? user) => LocalSettings().user = user;
-
-  String? get username => user?.username;
-  OAuthToken? get oauthToken => user?.token;
-
-  String? get studyId => bloc.studyId;
-  set studyId(String? id) {
-    if (CarpService().isConfigured) CarpService().app.studyId = id;
-  }
-
-  String? get studyDeploymentId => bloc.studyDeploymentId;
-  set studyDeploymentId(String? id) {
-    if (CarpService().isConfigured) CarpService().app.studyDeploymentId = id;
-  }
-
-  CarpBackend._() : super() {
-    // make sure that the json functions are loaded
-    CarpMobileSensing.ensureInitialized();
-    CognitionPackage.ensureInitialized();
-  }
-
-  factory CarpBackend() => _instance;
+  /// The CAWS app configuration.
+  CarpApp? app;
 
+  /// Initialize this backend. Must be called before used.
   Future<void> initialize() async {
+    info('$runtimeType - initializing');
+
     app = CarpApp(
       name: "CAWS @ DTU",
       uri: uri.replace(pathSegments: [uris[bloc.deploymentMode]!]),
@@ -77,19 +60,22 @@ class CarpBackend {
         '.well-known',
         'openid-configuration'
       ]),
-      studyId: studyId,
-      studyDeploymentId: studyDeploymentId,
+      studyId: bloc.studyId,
+      studyDeploymentId: bloc.studyDeploymentId,
     );
 
     CarpService().configure(app!);
+
+    // check if there is a user stored locally on the phone
     if (user != null) {
+      info('$runtimeType - User stored locally - user: $user');
       CarpService().currentUser = user;
       if (oauthToken!.hasExpired) {
         try {
           await refresh();
         } catch (error) {
           CarpService().currentUser = null;
-          warning('Failed to refresh access token - $error');
+          warning('$runtimeType - Failed to refresh access token - $error');
         }
       }
     }
@@ -99,24 +85,61 @@ class CarpBackend {
     info('$runtimeType initialized - app: $app');
   }
 
+  /// Authenticate using a web view.
   Future<CarpUser> authenticate() async {
-    bloc.stateStream.sink.add(StudiesAppState.authenticating);
     user = await CarpService().authenticate();
-
-    bloc.stateStream.sink.add(StudiesAppState.accessTokenRetrieved);
-
-    return user as CarpUser;
+    info('$runtimeType - User authenticated - user: $user');
+    debug(toJsonString(user));
+    return user!;
   }
 
+  /// Refresh authentication token based on the refresh token.
   Future<CarpUser> refresh() async {
-    bloc.stateStream.sink.add(StudiesAppState.authenticating);
     user = await CarpService().refresh();
+    info('$runtimeType - User authenticated via refresh - user: $user');
+    debug(toJsonString(user));
+    return user!;
+  }
+
+  /// Sign out from CAWS and erase all local authentication information.
+  Future<void> signOut() async {
+    if (CarpService().authenticated) await CarpService().logout();
+    await LocalSettings().eraseAuthCredentials();
+  }
+
+  /// Has the user been authenticated?
+  bool get isAuthenticated => CarpService().authenticated;
 
-    bloc.stateStream.sink.add(StudiesAppState.accessTokenRetrieved);
+  /// The user authenticated, if any.
+  CarpUser? get user => LocalSettings().user;
+  set user(CarpUser? user) => LocalSettings().user = user;
+
+  /// The user name of the user, if authenticated.
+  String? get username => user?.username;
+  OAuthToken? get oauthToken => user?.token;
+
+  /// The list of invitation for this user.
+  List<ActiveParticipationInvitation> invitations = [];
+
+  Future<List<ActiveParticipationInvitation>> getInvitations() async {
+    CarpParticipationService().configureFrom(CarpService());
 
-    return user as CarpUser;
+    invitations =
+        await CarpParticipationService().getActiveParticipationInvitations();
+
+    // Filter the invitations to only include those that
+    // have a smartphone as a device in [ActiveParticipationInvitation.assignedDevices] list
+    // (i.e. the invitation is for a smartphone).
+    // This is done to avoid showing invitations for other devices (e.g. [WebBrowser]).
+    invitations.removeWhere((invitation) =>
+        invitation.assignedDevices
+            ?.any((device) => device.device is! Smartphone) ??
+        false);
+
+    return invitations;
   }
 
+  /// Upload the result of an informed consent flow.
   Future<ConsentDocument?> uploadInformedConsent(
       RPTaskResult taskResult) async {
     RPConsentSignatureResult signatureResult =
@@ -137,9 +160,4 @@ class CarpBackend {
 
     return document;
   }
-
-  Future<void> signOut() async {
-    if (CarpService().authenticated) await CarpService().logout();
-    await LocalSettings().eraseAuthCredentials();
-  }
 }
diff --git a/lib/data/local_settings.dart b/lib/data/local_settings.dart
index 8212ac78..fceb57ee 100644
--- a/lib/data/local_settings.dart
+++ b/lib/data/local_settings.dart
@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of carp_study_app;
 
 /// A local settings manager. Works as a singleton - use `LocalSettings()`
 /// for accessing settings.
@@ -6,7 +6,7 @@ class LocalSettings {
   // Keys for storing in shared preferences
   static const String studyIdKey = 'study_id';
   static const String studyDeploymentIdKey = 'study_deployment_id';
-  static const String deviceRolenameKey = 'role_name';
+  static const String deviceRoleNameKey = 'role_name';
   static const String userKey = 'user';
   static const String informedConsentAcceptedKey = 'informed_consent_accepted';
 
@@ -16,16 +16,17 @@ class LocalSettings {
 
   String? _studyId;
   String? _studyDeploymentId;
-  String? _deviceRolename;
+  String? _deviceRoleName;
   bool? _hasInformedConsentBeenAccepted;
   CarpUser? _user;
 
+  /// The user saved on this device, if any.
   CarpUser? get user {
     if (_user == null) {
       String? userString = Settings().preferences!.getString(userKey);
 
       _user = (userString != null)
-          ? CarpUser.fromJson(jsonDecode(userString))
+          ? CarpUser.fromJson(jsonDecode(userString) as Map<String, dynamic>)
           : null;
     }
     return _user;
@@ -33,7 +34,9 @@ class LocalSettings {
 
   set user(CarpUser? user) {
     _user = user;
-    Settings().preferences!.setString(userKey, jsonEncode(user!.toJson()));
+    (user != null)
+        ? Settings().preferences!.setString(userKey, jsonEncode(user.toJson()))
+        : Settings().preferences!.remove(userKey);
   }
 
   String? get studyId =>
@@ -64,25 +67,25 @@ class LocalSettings {
   /// The device role name for the currently running deployment.
   /// Returns the role name cached locally on the phone (if available).
   /// Returns `null` if no study is deployed (yet).
-  String? get deviceRolename => (_deviceRolename ??=
-      Settings().preferences?.getString(deviceRolenameKey));
+  String? get deviceRoleName => (_deviceRoleName ??=
+      Settings().preferences?.getString(deviceRoleNameKey));
 
   /// Set the device role name for the currently running deployment.
   /// This name will be cached locally on the phone.
-  set deviceRolename(String? name) {
+  set deviceRoleName(String? name) {
     assert(
         name != null,
         'Cannot set the study deployment id to null in Settings. '
         "Use the 'eraseStudyDeployment()' method to erase study deployment information.");
-    _deviceRolename = name;
-    Settings().preferences?.setString(deviceRolenameKey, name!);
+    _deviceRoleName = name;
+    Settings().preferences?.setString(deviceRoleNameKey, name!);
   }
 
   /// Erase all study deployment information cached locally on this phone.
   Future<void> eraseStudyDeployment() async {
     _studyDeploymentId = null;
     await Settings().preferences!.remove(studyDeploymentIdKey);
-    await Settings().preferences!.remove(deviceRolenameKey);
+    await Settings().preferences!.remove(deviceRoleNameKey);
   }
 
   Future<String?> get deploymentBasePath async => (studyDeploymentId == null)
diff --git a/lib/data/localization_loader.dart b/lib/data/localization_loader.dart
index 7bfccee6..4f7c81e1 100644
--- a/lib/data/localization_loader.dart
+++ b/lib/data/localization_loader.dart
@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of carp_study_app;
 
 /// A [LocalizationLoader] that knows how to load localizations from a
 /// [LocalizationManager].
diff --git a/lib/main.dart b/lib/main.dart
index 8601aa51..6f3c7908 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -6,20 +6,21 @@ import 'dart:convert';
 import 'dart:ui' as ui;
 import 'dart:io';
 
+import 'package:carp_health_package/health_package.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
+
 import 'package:json_annotation/json_annotation.dart';
 import 'package:fl_chart/fl_chart.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:timeago/timeago.dart' as timeago;
 import 'package:camera/camera.dart';
 import 'package:video_player/video_player.dart';
 import 'package:app_settings/app_settings.dart';
-
 import 'package:google_fonts/google_fonts.dart';
 import 'package:go_router/go_router.dart';
 import 'package:intl/intl.dart';
-import 'package:flutter/src/rendering/sliver_persistent_header.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 import 'package:permission_handler/permission_handler.dart';
 
@@ -28,7 +29,6 @@ import 'package:carp_serializable/carp_serializable.dart';
 import 'package:carp_core/carp_core.dart';
 import 'package:carp_mobile_sensing/carp_mobile_sensing.dart';
 import 'package:carp_audio_package/media.dart';
-import 'package:carp_health_package/health_package.dart';
 //import 'package:carp_connectivity_package/connectivity.dart';
 //import 'package:carp_communication_package/communication.dart';
 import 'package:carp_context_package/carp_context_package.dart';
@@ -42,20 +42,20 @@ import 'package:research_package/research_package.dart';
 import 'package:cognition_package/cognition_package.dart';
 
 part 'blocs/app_bloc.dart';
-part 'blocs/common.dart';
+part 'blocs/util.dart';
 
 part 'data/local_settings.dart';
 part 'data/carp_backend.dart';
 part 'data/localization_loader.dart';
-part 'sensing/sensing.dart';
+part 'blocs/sensing.dart';
 
 part 'view_models/view_model.dart';
 part 'view_models/tasklist_page_model.dart';
 part 'view_models/study_page_model.dart';
 part 'view_models/profile_page_model.dart';
-part 'view_models/devices_page_model.dart';
+part 'view_models/device_view_models.dart';
 part 'view_models/data_visualization_page_model.dart';
-part 'view_models/invitations_list_model.dart';
+part 'view_models/invitations_view_model.dart';
 part 'view_models/informed_consent_page_model.dart';
 part 'view_models/cards/activity_data_model.dart';
 part 'view_models/cards/mobility_data_model.dart';
@@ -68,7 +68,7 @@ part 'view_models/user_tasks.dart';
 
 part 'carp_study_app.dart';
 part 'ui/pages/informed_consent_page.dart';
-part 'ui/pages/bottom_navigation_bar.dart';
+part 'ui/pages/home_page.dart';
 part 'ui/widgets/carp_app_bar.dart';
 part 'ui/carp_study_style.dart';
 part 'ui/colors.dart';
@@ -85,10 +85,9 @@ part 'ui/pages/process_message_page.dart';
 part 'ui/pages/camera_task_page.dart';
 part 'ui/pages/display_picture_page.dart';
 part 'ui/pages/camera_page.dart';
-part 'ui/pages/loading_page.dart';
 part 'ui/pages/error_page.dart';
-part 'ui/pages/cans_login.dart';
-part 'ui/pages/devices_page.dart';
+part 'ui/pages/login_page.dart';
+part 'ui/pages/device_list_page.dart';
 part 'ui/pages/devices_page.authorization_dialog.dart';
 part 'ui/pages/devices_page.enable_bluetooth_dialog.dart';
 part 'ui/pages/devices_page.connection_dialog.dart';
diff --git a/lib/ui/cards/activity_card.dart b/lib/ui/cards/activity_card.dart
index ffcdf7ac..fb09a7dd 100644
--- a/lib/ui/cards/activity_card.dart
+++ b/lib/ui/cards/activity_card.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class ActivityCard extends StatefulWidget {
   final ActivityCardViewModel model;
diff --git a/lib/ui/cards/distance_card.dart b/lib/ui/cards/distance_card.dart
index 3b59531e..7be05153 100644
--- a/lib/ui/cards/distance_card.dart
+++ b/lib/ui/cards/distance_card.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class DistanceCard extends StatefulWidget {
   final List<Color> colors;
diff --git a/lib/ui/cards/heart_rate_card.dart b/lib/ui/cards/heart_rate_card.dart
index 964303e9..b78ad49e 100644
--- a/lib/ui/cards/heart_rate_card.dart
+++ b/lib/ui/cards/heart_rate_card.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class HeartRateCardWidget extends StatefulWidget {
   final HeartRateCardViewModel model;
diff --git a/lib/ui/cards/media_card.dart b/lib/ui/cards/media_card.dart
index 1cbe2b76..8fe4369d 100644
--- a/lib/ui/cards/media_card.dart
+++ b/lib/ui/cards/media_card.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class MediaCardWidget extends StatefulWidget {
   final List<TaskCardViewModel> modelsList;
diff --git a/lib/ui/cards/mobility_card.dart b/lib/ui/cards/mobility_card.dart
index ee51ebe3..ab9a33ea 100644
--- a/lib/ui/cards/mobility_card.dart
+++ b/lib/ui/cards/mobility_card.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class MobilityCard extends StatefulWidget {
   final List<Color> colors;
diff --git a/lib/ui/cards/scoreboard_card.dart b/lib/ui/cards/scoreboard_card.dart
index 30bddc01..cb811f27 100644
--- a/lib/ui/cards/scoreboard_card.dart
+++ b/lib/ui/cards/scoreboard_card.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class ScoreboardCard extends StatefulWidget {
   final TaskListPageViewModel model;
diff --git a/lib/ui/cards/steps_card.dart b/lib/ui/cards/steps_card.dart
index 95f8b676..5c0c0f61 100644
--- a/lib/ui/cards/steps_card.dart
+++ b/lib/ui/cards/steps_card.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class StepsCardWidget extends StatefulWidget {
   final List<Color> colors;
diff --git a/lib/ui/cards/study_progress_card.dart b/lib/ui/cards/study_progress_card.dart
index 309b219c..a98f034c 100644
--- a/lib/ui/cards/study_progress_card.dart
+++ b/lib/ui/cards/study_progress_card.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class StudyProgressCardWidget extends StatefulWidget {
   final StudyProgressCardViewModel model;
diff --git a/lib/ui/cards/survey_card.dart b/lib/ui/cards/survey_card.dart
index de12ba06..75681124 100644
--- a/lib/ui/cards/survey_card.dart
+++ b/lib/ui/cards/survey_card.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class SurveyCard extends StatefulWidget {
   final TaskCardViewModel model;
diff --git a/lib/ui/carp_study_style.dart b/lib/ui/carp_study_style.dart
index f69895c9..a6d89f31 100644
--- a/lib/ui/carp_study_style.dart
+++ b/lib/ui/carp_study_style.dart
@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of carp_study_app;
 
 ThemeData carpStudyTheme = ThemeData.light().copyWith(
   primaryColor: const Color(0xFF206FA2),
diff --git a/lib/ui/colors.dart b/lib/ui/colors.dart
index 1dad319a..246c3acd 100644
--- a/lib/ui/colors.dart
+++ b/lib/ui/colors.dart
@@ -1,9 +1,9 @@
 // ignore_for_file: constant_identifier_names
 
-part of '../main.dart';
+part of carp_study_app;
 
 class CACHET {
-  static const Color CACHET_BLUE = Color.fromRGBO(97, 195, 217, 1.0);
+  static const Color BLUE = Color.fromRGBO(97, 195, 217, 1.0);
   static const Color RED = Color.fromRGBO(213, 11, 51, 1.0);
   static const Color WHITE = Color.fromRGBO(255, 255, 255, 1.0);
   static const Color BLACK = Color.fromRGBO(1, 1, 1, 1.0);
@@ -63,8 +63,8 @@ class CACHET {
 }
 
 MaterialColor createMaterialColor(Color color) {
-  List strengths = <double>[.05];
-  Map swatch = <int?, Color>{};
+  var strengths = <double>[.05];
+  var swatch = <int?, Color>{};
   final int r = color.red, g = color.green, b = color.blue;
 
   for (int i = 1; i < 10; i++) {
diff --git a/lib/ui/pages/audio_task_page.dart b/lib/ui/pages/audio_task_page.dart
index e064e45c..12afa5d1 100644
--- a/lib/ui/pages/audio_task_page.dart
+++ b/lib/ui/pages/audio_task_page.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class AudioTaskPage extends StatefulWidget {
   final AudioUserTask? audioUserTask;
@@ -330,7 +330,7 @@ class AudioTaskPageState extends State<AudioTaskPage> {
   }
 
   // Taken from RP
-  Future _showCancelConfirmationDialog() {
+  Future<void> _showCancelConfirmationDialog() {
     RPLocalizations locale = RPLocalizations.of(context)!;
 
     return showDialog(
diff --git a/lib/ui/pages/camera_page.dart b/lib/ui/pages/camera_page.dart
index 87b3514e..a69a4c9e 100644
--- a/lib/ui/pages/camera_page.dart
+++ b/lib/ui/pages/camera_page.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class CameraPage extends StatefulWidget {
   final VideoUserTask videoUserTask;
@@ -107,11 +107,12 @@ class CameraPageState extends State<CameraPage> {
                       var picture = await _cameraController!.takePicture();
                       widget.videoUserTask.onPictureCapture(picture);
                       if (context.mounted) {
-                        await Navigator.of(context).push(MaterialPageRoute(
-                            builder: (context) => DisplayPicturePage(
-                                  file: picture,
-                                  videoUserTask: widget.videoUserTask,
-                                )));
+                        await Navigator.of(context)
+                            .push(MaterialPageRoute<void>(
+                                builder: (context) => DisplayPicturePage(
+                                      file: picture,
+                                      videoUserTask: widget.videoUserTask,
+                                    )));
                       }
 
                       setState(() {
@@ -140,7 +141,7 @@ class CameraPageState extends State<CameraPage> {
                         widget.videoUserTask.onRecordStop(video);
                         if (context.mounted) {
                           await Navigator.of(context).push(
-                            MaterialPageRoute(
+                            MaterialPageRoute<void>(
                                 builder: (context) => DisplayPicturePage(
                                     file: video,
                                     isVideo: true,
@@ -213,7 +214,7 @@ class CameraPageState extends State<CameraPage> {
     );
   }
 
-  Future _showCancelConfirmationDialog() {
+  Future<void> _showCancelConfirmationDialog() {
     RPLocalizations locale = RPLocalizations.of(context)!;
 
     return showDialog(
diff --git a/lib/ui/pages/camera_task_page.dart b/lib/ui/pages/camera_task_page.dart
index 4c0f01fa..feeaded2 100644
--- a/lib/ui/pages/camera_task_page.dart
+++ b/lib/ui/pages/camera_task_page.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class CameraTaskPage extends StatefulWidget {
   final VideoUserTask mediaUserTask;
@@ -85,7 +85,7 @@ class CameraTaskPageState extends State<CameraTaskPage> {
                         child: IconButton(
                           onPressed: () => Navigator.push(
                             context,
-                            MaterialPageRoute(
+                            MaterialPageRoute<void>(
                               builder: (context) => CameraPage(
                                 videoUserTask: widget.mediaUserTask,
                                 // cameras: widget.mediaUserTask.cameras,
@@ -121,7 +121,7 @@ class CameraTaskPageState extends State<CameraTaskPage> {
   }
 
 // Taken from RP
-  Future _showCancelConfirmationDialog() {
+  Future<void> _showCancelConfirmationDialog() {
     RPLocalizations locale = RPLocalizations.of(context)!;
 
     return showDialog(
diff --git a/lib/ui/pages/cans_login.dart b/lib/ui/pages/cans_login.dart
deleted file mode 100644
index ff40392f..00000000
--- a/lib/ui/pages/cans_login.dart
+++ /dev/null
@@ -1,94 +0,0 @@
-part of '../../main.dart';
-
-class LoginPage extends StatefulWidget {
-  const LoginPage({super.key});
-
-  @override
-  State<LoginPage> createState() => _LoginPageState();
-}
-
-class _LoginPageState extends State<LoginPage> {
-  final GlobalKey webViewKey = GlobalKey();
-
-  @override
-  Widget build(BuildContext context) {
-    RPLocalizations locale = RPLocalizations.of(context)!;
-    return Scaffold(
-      body: SafeArea(
-        child: Center(
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.end,
-            crossAxisAlignment: CrossAxisAlignment.center,
-            children: [
-              Expanded(
-                child: Container(
-                  margin:
-                      const EdgeInsets.symmetric(vertical: 32, horizontal: 56),
-                  child: Image.asset(
-                    'assets/carp_logo.png',
-                    fit: BoxFit.contain,
-                  ),
-                ),
-              ),
-              Container(
-                margin:
-                    const EdgeInsets.symmetric(vertical: 16, horizontal: 64),
-                width: MediaQuery.of(context).size.width,
-                height: 56,
-                decoration: BoxDecoration(
-                  color: const Color(
-                    0xff006398,
-                  ),
-                  borderRadius: BorderRadius.circular(
-                    100,
-                  ),
-                ),
-                child: TextButton(
-                  onPressed: () async {
-                    await bloc.backend.authenticate();
-                    if (bloc.backend.isAuthenticated) {
-                      if (context.mounted) {
-                        context.push('/invitations').then((value) {
-                          setState(() {});
-                        });
-                      }
-                    }
-                  },
-                  child: Text(
-                    locale.translate("pages.login.login"),
-                    style: const TextStyle(
-                      color: Color(
-                        0xffffffff,
-                      ),
-                      fontSize: 22,
-                    ),
-                    textAlign: TextAlign.center,
-                  ),
-                ),
-              ),
-              if (CarpService().authenticated)
-                TextButton(
-                  onPressed: () {
-                    showDialog(
-                      context: context,
-                      builder: (context) {
-                        return const LogoutMessage();
-                      },
-                    ).then((value) async {
-                      if (value == true) {
-                        await bloc.backend.signOut();
-                        setState(() {});
-                      }
-                    });
-                  },
-                  child: Text(
-                    locale.translate('pages.login.endsession'),
-                  ),
-                )
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}
diff --git a/lib/ui/pages/data_visualization_page.dart b/lib/ui/pages/data_visualization_page.dart
index eb8d6060..b05b2af5 100644
--- a/lib/ui/pages/data_visualization_page.dart
+++ b/lib/ui/pages/data_visualization_page.dart
@@ -1,7 +1,8 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 // todo change text for survey progress
 class DataVisualizationPage extends StatefulWidget {
+  static const String route = '/data';
   final DataVisualizationPageViewModel model;
   const DataVisualizationPage(this.model, {super.key});
 
@@ -64,7 +65,7 @@ class _DataVisualizationPageState extends State<DataVisualizationPage> {
     final List<Widget> widgets = [];
 
     // Show user task progress, if study has any tasks.
-    if (bloc.hasSurveys()) {
+    if (bloc.hasUserTasks()) {
       widgets.add(
           StudyProgressCardWidget(widget.model.studyProgressCardDataModel));
     }
@@ -76,7 +77,7 @@ class _DataVisualizationPageState extends State<DataVisualizationPage> {
     }
 
     // check to show surveys stats
-    if (bloc.hasSurveys()) {
+    if (bloc.hasUserTasks()) {
       widgets.add(SurveyCard(widget.model.surveysCardDataModel));
     }
 
diff --git a/lib/ui/pages/devices_page.dart b/lib/ui/pages/device_list_page.dart
similarity index 60%
rename from lib/ui/pages/devices_page.dart
rename to lib/ui/pages/device_list_page.dart
index 4331eb31..96a3fe77 100644
--- a/lib/ui/pages/devices_page.dart
+++ b/lib/ui/pages/device_list_page.dart
@@ -1,32 +1,37 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 /// State of Bluetooth connection UI.
 enum CurrentStep { scan, instructions, done }
 
-class DevicesPage extends StatefulWidget {
-  const DevicesPage({super.key});
+/// The page showing the list of devices, ordered as:
+///  * The Smartphone device (primary device)
+///  * Any hardware devices (connected devices)
+///  * Any online services (connected services)
+class DeviceListPage extends StatefulWidget {
+  static const String route = '/devices';
+  const DeviceListPage({super.key});
 
   @override
-  DevicesPageState createState() => DevicesPageState();
+  DeviceListPageState createState() => DeviceListPageState();
 }
 
-class DevicesPageState extends State<DevicesPage> {
-  StreamSubscription? bluetoothStateStream;
+class DeviceListPageState extends State<DeviceListPage> {
+  StreamSubscription<BluetoothAdapterState>? bluetoothStateStream;
   BluetoothAdapterState? bluetoothAdapterState;
 
-  List<DeviceModel> physicalDevices = bloc.runningDevices
+  final List<DeviceViewModel> _smartphoneDevice = bloc.runningDevices
+      .where((element) => element.deviceManager is SmartphoneDeviceManager)
+      .toList();
+
+  final List<DeviceViewModel> _hardwareDevices = bloc.runningDevices
       .where((element) =>
           element.deviceManager is HardwareDeviceManager &&
           element.deviceManager is! SmartphoneDeviceManager)
       .toList();
-  List<DeviceModel> onlineServices = bloc.runningDevices
+  final List<DeviceViewModel> _onlineServices = bloc.runningDevices
       .where((element) => element.deviceManager is OnlineServiceManager)
       .toList();
 
-  List<DeviceModel> smartphoneDevice = bloc.runningDevices
-      .where((element) => element.deviceManager is SmartphoneDeviceManager)
-      .toList();
-
   @override
   void initState() {
     super.initState();
@@ -76,11 +81,11 @@ class DevicesPageState extends State<DevicesPage> {
               flex: 4,
               child: CustomScrollView(
                 slivers: [
-                  ..._smartphoneDeviceListWidget(locale),
-                  if (physicalDevices.isNotEmpty)
-                    ..._physicalDevicesListWidget(locale),
-                  if (onlineServices.isNotEmpty)
-                    ..._onlineServicesListWidget(locale),
+                  ..._smartphoneDeviceList(locale),
+                  if (_hardwareDevices.isNotEmpty)
+                    ..._hardwareDevicesList(locale),
+                  if (_onlineServices.isNotEmpty)
+                    ..._onlineServicesList(locale),
                 ],
               ),
             ),
@@ -90,79 +95,82 @@ class DevicesPageState extends State<DevicesPage> {
     );
   }
 
-  List<Widget> _smartphoneDeviceListWidget(RPLocalizations locale) => [
+  /// The list of smartphones - which is a list with only one smartphone.
+  List<Widget> _smartphoneDeviceList(RPLocalizations locale) => [
         DevicesPageListTitle(locale: locale, type: DevicesPageTypes.phone),
         SliverList(
-          delegate:
-              SliverChildBuilderDelegate((BuildContext context, int index) {
-            return Center(
-              child: StudiesCard(
-                child: _cardListBuilder(
-                  smartphoneDevice[index].icon!,
-                  smartphoneDevice[index].phoneInfo['name']!,
-                  (
-                    "${smartphoneDevice[index].phoneInfo["model"]!} - ${smartphoneDevice[index].phoneInfo["version"]!}",
-                    smartphoneDevice[index].batteryLevel ?? 0,
-                  ),
-                ),
-              ),
-            );
-          }, childCount: smartphoneDevice.length),
-        ),
+            delegate: SliverChildBuilderDelegate(
+          (BuildContext context, int index) => ListenableBuilder(
+              listenable: _smartphoneDevice[index],
+              builder: (BuildContext context, Widget? widget) => Center(
+                      child: StudiesCard(
+                          child: _cardListBuilder(
+                              _smartphoneDevice[index].icon!,
+                              _smartphoneDevice[index].phoneInfo['name']!, (
+                    "${_smartphoneDevice[index].phoneInfo["model"]!} - ${_smartphoneDevice[index].phoneInfo["version"]!}",
+                    _smartphoneDevice[index].batteryLevel ?? 0,
+                  ))))),
+          childCount: _smartphoneDevice.length,
+        )),
       ];
 
-  List<Widget> _physicalDevicesListWidget(RPLocalizations locale) => [
+  /// The list of connected hardware devices (like a Polar sensor)
+  List<Widget> _hardwareDevicesList(RPLocalizations locale) => [
         DevicesPageListTitle(locale: locale, type: DevicesPageTypes.devices),
         SliverList(
           delegate:
               SliverChildBuilderDelegate((BuildContext context, int index) {
-            DeviceModel device = physicalDevices[index];
+            DeviceViewModel device = _hardwareDevices[index];
             return _devicesPageCardStream(
-                device.deviceEvents,
+                device.statusEvents,
                 () => _cardListBuilder(
                     device.icon!,
                     locale.translate(device.name!),
                     (device.id, device.batteryLevel ?? 0),
                     enableFeedback: true,
-                    onTap: () => _physicalDeviceClicked(device),
+                    onTap: () async => await _hardwareDeviceClicked(device),
                     trailing: device.getDeviceStatusIcon is String
                         ? Text(
                             locale
-                                .translate(device.getDeviceStatusIcon)
+                                .translate(device.getDeviceStatusIcon as String)
                                 .toUpperCase(),
                             style: aboutCardTitleStyle.copyWith(
                                 color: Theme.of(context).primaryColor))
-                        : device.getDeviceStatusIcon),
+                        : device.getDeviceStatusIcon as Icon),
                 DeviceStatus.unknown);
-          }, childCount: physicalDevices.length),
+          }, childCount: _hardwareDevices.length),
         ),
       ];
 
-  List<Widget> _onlineServicesListWidget(RPLocalizations locale) => [
+  /// The list of online services (like a Location service)
+  List<Widget> _onlineServicesList(RPLocalizations locale) => [
         DevicesPageListTitle(locale: locale, type: DevicesPageTypes.services),
         SliverList(
-          delegate:
-              SliverChildBuilderDelegate((BuildContext context, int index) {
-            DeviceModel service = onlineServices[index];
-            return _devicesPageCardStream(
-                service.deviceEvents,
-                () => _cardListBuilder(
-                      service.icon!,
-                      locale.translate(service.name!),
-                      null,
-                      trailing: service.getServiceStatusIcon is String
-                          ? Text(
-                              locale
-                                  .translate(service.getServiceStatusIcon)
-                                  .toUpperCase(),
-                              style: aboutCardTitleStyle.copyWith(
-                                  color: Theme.of(context).primaryColor))
-                          : service.getServiceStatusIcon,
-                      isThreeLine: false,
-                      onTap: () => _onlineServiceClicked(service),
-                    ),
-                DeviceStatus.unknown);
-          }, childCount: onlineServices.length),
+          delegate: SliverChildBuilderDelegate(
+            (BuildContext context, int index) {
+              DeviceViewModel service = _onlineServices[index];
+              return _devicesPageCardStream(
+                  service.statusEvents,
+                  () => _cardListBuilder(
+                        service.icon!,
+                        locale.translate(service.name!),
+                        null,
+                        trailing: service.getServiceStatusIcon is String
+                            ? Text(
+                                locale
+                                    .translate(
+                                        service.getServiceStatusIcon as String)
+                                    .toUpperCase(),
+                                style: aboutCardTitleStyle.copyWith(
+                                    color: Theme.of(context).primaryColor))
+                            : service.getServiceStatusIcon as Icon,
+                        isThreeLine: false,
+                        onTap: () => _onlineServiceClicked(service),
+                      ),
+                  DeviceStatus.unknown);
+            },
+            childCount: _onlineServices.length,
+          ),
         ),
       ];
 
@@ -172,8 +180,8 @@ class DevicesPageState extends State<DevicesPage> {
     (String, int)? subtitle, {
     Widget? trailing,
     void Function()? onTap,
-    enableFeedback = false,
-    isThreeLine = true,
+    bool enableFeedback = false,
+    bool isThreeLine = true,
   }) =>
       ListTile(
         enableFeedback: enableFeedback,
@@ -209,7 +217,10 @@ class DevicesPageState extends State<DevicesPage> {
       );
 
   Widget _devicesPageCardStream<T>(
-          Stream<T> stream, Widget Function() childBuilder, T? initialData) =>
+    Stream<T> stream,
+    Widget Function() childBuilder,
+    T? initialData,
+  ) =>
       Center(
         child: StudiesCard(
           child: StreamBuilder<T>(
@@ -220,7 +231,7 @@ class DevicesPageState extends State<DevicesPage> {
         ),
       );
 
-  void _onlineServiceClicked(DeviceModel service) {
+  void _onlineServiceClicked(DeviceViewModel service) {
     if (service.status == DeviceStatus.connected ||
         service.status == DeviceStatus.connecting) {
       return;
@@ -237,7 +248,7 @@ class DevicesPageState extends State<DevicesPage> {
     });
   }
 
-  void _physicalDeviceClicked(DeviceModel device) async {
+  Future<void> _hardwareDeviceClicked(DeviceViewModel device) async {
     if (await FlutterBluePlus.isSupported == false) {
       return;
     }
@@ -250,7 +261,7 @@ class DevicesPageState extends State<DevicesPage> {
     if (context.mounted) {
       if (bluetoothAdapterState == BluetoothAdapterState.off &&
           Platform.isIOS) {
-        await showDialog(
+        await showDialog<void>(
           context: context,
           barrierDismissible: true,
           builder: (context) => EnableBluetoothDialog(device: device),
@@ -258,19 +269,19 @@ class DevicesPageState extends State<DevicesPage> {
       } else if (bluetoothAdapterState == BluetoothAdapterState.on) {
         if (device.status == DeviceStatus.connected ||
             device.status == DeviceStatus.connecting) {
-          bool result = await showDialog(
+          bool? result = await showDialog<bool>(
             context: context,
             barrierDismissible: true,
             builder: (context) => DisconnectionDialog(device: device),
           );
 
           if (result == true) {
-            device.disconnectFromDevice(device.deviceManager);
+            await device.disconnectFromDevice();
           } else {
-            FlutterBluePlus.stopScan();
+            await FlutterBluePlus.stopScan();
           }
         } else {
-          await showDialog(
+          await showDialog<void>(
             context: context,
             barrierDismissible: true,
             builder: (context) => ConnectionDialog(device: device),
@@ -278,7 +289,7 @@ class DevicesPageState extends State<DevicesPage> {
         }
       } else if (bluetoothAdapterState == BluetoothAdapterState.unauthorized &&
           Platform.isIOS) {
-        await showDialog(
+        await showDialog<void>(
           context: context,
           barrierDismissible: true,
           builder: (context) => AuthorizationDialog(device: device),
diff --git a/lib/ui/pages/devices_page.authorization_dialog.dart b/lib/ui/pages/devices_page.authorization_dialog.dart
index 07d02f31..d8ccf376 100644
--- a/lib/ui/pages/devices_page.authorization_dialog.dart
+++ b/lib/ui/pages/devices_page.authorization_dialog.dart
@@ -1,7 +1,7 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class AuthorizationDialog extends StatelessWidget {
-  final DeviceModel device;
+  final DeviceViewModel device;
 
   const AuthorizationDialog({super.key, required this.device});
 
@@ -20,7 +20,8 @@ class AuthorizationDialog extends StatelessWidget {
         ));
   }
 
-  Widget authorizationInstructions(BuildContext context, DeviceModel device) {
+  Widget authorizationInstructions(
+      BuildContext context, DeviceViewModel device) {
     RPLocalizations locale = RPLocalizations.of(context)!;
     return Column(
       children: [
diff --git a/lib/ui/pages/devices_page.connection_dialog.dart b/lib/ui/pages/devices_page.connection_dialog.dart
index 34c4432f..92b7bdd0 100644
--- a/lib/ui/pages/devices_page.connection_dialog.dart
+++ b/lib/ui/pages/devices_page.connection_dialog.dart
@@ -1,7 +1,7 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class ConnectionDialog extends StatefulWidget {
-  final DeviceModel device;
+  final DeviceViewModel device;
 
   const ConnectionDialog({super.key, required this.device});
 
@@ -100,10 +100,7 @@ class _ConnectionDialogState extends State<ConnectionDialog> {
         buildTranslatedButton("pages.devices.connection.done", () {
           FlutterBluePlus.stopScan();
           if (selectedDevice != null) {
-            widget.device.connectToDevice(
-              selectedDevice!,
-              widget.device.deviceManager,
-            );
+            widget.device.connectToDevice(selectedDevice!);
             context.pop(true);
           }
         }),
@@ -114,7 +111,7 @@ class _ConnectionDialogState extends State<ConnectionDialog> {
 
   Widget stepContent(
     CurrentStep currentStep,
-    DeviceModel device,
+    DeviceViewModel device,
   ) {
     if (currentStep == CurrentStep.scan) {
       return scanWidget(device, context);
@@ -125,7 +122,7 @@ class _ConnectionDialogState extends State<ConnectionDialog> {
     }
   }
 
-  Widget scanWidget(DeviceModel device, BuildContext context) {
+  Widget scanWidget(DeviceViewModel device, BuildContext context) {
     RPLocalizations locale = RPLocalizations.of(context)!;
 
     return Column(
@@ -174,7 +171,7 @@ class _ConnectionDialogState extends State<ConnectionDialog> {
     );
   }
 
-  Widget connectionInstructions(DeviceModel device, BuildContext context) {
+  Widget connectionInstructions(DeviceViewModel device, BuildContext context) {
     RPLocalizations locale = RPLocalizations.of(context)!;
     return Column(
       children: [
diff --git a/lib/ui/pages/devices_page.disconnection_dialog.dart b/lib/ui/pages/devices_page.disconnection_dialog.dart
index 6f90ab52..234db750 100644
--- a/lib/ui/pages/devices_page.disconnection_dialog.dart
+++ b/lib/ui/pages/devices_page.disconnection_dialog.dart
@@ -1,7 +1,7 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class DisconnectionDialog extends StatelessWidget {
-  final DeviceModel device;
+  final DeviceViewModel device;
 
   const DisconnectionDialog({super.key, required this.device});
 
@@ -19,7 +19,7 @@ class DisconnectionDialog extends StatelessWidget {
         ));
   }
 
-  Widget disconnectBluetooth(BuildContext context, DeviceModel device) {
+  Widget disconnectBluetooth(BuildContext context, DeviceViewModel device) {
     RPLocalizations locale = RPLocalizations.of(context)!;
 
     return Column(
diff --git a/lib/ui/pages/devices_page.enable_bluetooth_dialog.dart b/lib/ui/pages/devices_page.enable_bluetooth_dialog.dart
index 7e55dc41..946eae2e 100644
--- a/lib/ui/pages/devices_page.enable_bluetooth_dialog.dart
+++ b/lib/ui/pages/devices_page.enable_bluetooth_dialog.dart
@@ -1,7 +1,7 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class EnableBluetoothDialog extends StatelessWidget {
-  final DeviceModel device;
+  final DeviceViewModel device;
 
   const EnableBluetoothDialog({super.key, required this.device});
 
@@ -19,7 +19,8 @@ class EnableBluetoothDialog extends StatelessWidget {
         ));
   }
 
-  Widget enableBluetoothInstructions(BuildContext context, DeviceModel device) {
+  Widget enableBluetoothInstructions(
+      BuildContext context, DeviceViewModel device) {
     RPLocalizations locale = RPLocalizations.of(context)!;
     return Column(
       children: [
diff --git a/lib/ui/pages/devices_page.list_title.dart b/lib/ui/pages/devices_page.list_title.dart
index 111b30f9..e72dff8c 100644
--- a/lib/ui/pages/devices_page.list_title.dart
+++ b/lib/ui/pages/devices_page.list_title.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 enum DevicesPageTypes {
   phone,
diff --git a/lib/ui/pages/display_picture_page.dart b/lib/ui/pages/display_picture_page.dart
index 31e54d5f..816090f0 100644
--- a/lib/ui/pages/display_picture_page.dart
+++ b/lib/ui/pages/display_picture_page.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class DisplayPicturePage extends StatefulWidget {
   final XFile file;
@@ -173,7 +173,7 @@ class DisplayPicturePageState extends State<DisplayPicturePage> {
   }
 
   // Taken from RP
-  Future _showCancelConfirmationDialog() {
+  Future<void> _showCancelConfirmationDialog() {
     RPLocalizations locale = RPLocalizations.of(context)!;
 
     return showDialog(
diff --git a/lib/ui/pages/error_page.dart b/lib/ui/pages/error_page.dart
index 0681311b..510d2249 100644
--- a/lib/ui/pages/error_page.dart
+++ b/lib/ui/pages/error_page.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class ErrorPage extends StatelessWidget {
   const ErrorPage({super.key});
diff --git a/lib/ui/pages/bottom_navigation_bar.dart b/lib/ui/pages/home_page.dart
similarity index 83%
rename from lib/ui/pages/bottom_navigation_bar.dart
rename to lib/ui/pages/home_page.dart
index c7003025..a6d2593e 100644
--- a/lib/ui/pages/bottom_navigation_bar.dart
+++ b/lib/ui/pages/home_page.dart
@@ -1,9 +1,11 @@
-part of '../../main.dart';
+part of carp_study_app;
 
+/// The home page of the app.
+///
+/// Shown once the onboarding process is done.
 class HomePage extends StatefulWidget {
-  const HomePage({required this.child, super.key});
-
   final Widget child;
+  const HomePage({required this.child, super.key});
 
   @override
   HomePageState createState() => HomePageState();
@@ -57,16 +59,16 @@ class HomePageState extends State<HomePage> {
 
   static int _calculateSelectedIndex(BuildContext context) {
     final String location = GoRouterState.of(context).matchedLocation;
-    if (location.startsWith('/tasks')) {
+    if (location.startsWith(TaskListPage.route)) {
       return 0;
     }
-    if (location.startsWith('/about')) {
+    if (location.startsWith(StudyPage.route)) {
       return 1;
     }
-    if (location.startsWith('/data')) {
+    if (location.startsWith(DataVisualizationPage.route)) {
       return 2;
     }
-    if (location.startsWith('/devices')) {
+    if (location.startsWith(DeviceListPage.route)) {
       return 3;
     }
     return -1;
@@ -75,16 +77,16 @@ class HomePageState extends State<HomePage> {
   void _onItemTapped(int index, BuildContext context) {
     switch (index) {
       case 0:
-        context.go('/tasks');
+        context.go(TaskListPage.route);
         break;
       case 1:
-        context.go('/about');
+        context.go(StudyPage.route);
         break;
       case 2:
-        context.go('/data');
+        context.go(DataVisualizationPage.route);
         break;
       case 3:
-        context.go('/devices');
+        context.go(DeviceListPage.route);
         break;
       case -1:
         context.go('/');
diff --git a/lib/ui/pages/informed_consent_page.dart b/lib/ui/pages/informed_consent_page.dart
index b21b05d4..50fd74cc 100644
--- a/lib/ui/pages/informed_consent_page.dart
+++ b/lib/ui/pages/informed_consent_page.dart
@@ -1,9 +1,9 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class InformedConsentPage extends StatefulWidget {
+  static const String route = '/consent';
   final InformedConsentViewModel model;
-
-  const InformedConsentPage(this.model, {super.key});
+  const InformedConsentPage({super.key, required this.model});
 
   @override
   InformedConsentState createState() => InformedConsentState();
diff --git a/lib/ui/pages/invitation_list_page.dart b/lib/ui/pages/invitation_list_page.dart
index 31f74979..71e89c0f 100644
--- a/lib/ui/pages/invitation_list_page.dart
+++ b/lib/ui/pages/invitation_list_page.dart
@@ -1,16 +1,16 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class InvitationListPage extends StatelessWidget {
-  final InvitationsListViewModel model;
-
-  const InvitationListPage(this.model, {super.key});
+  static const String route = '/invitations';
+  final InvitationsViewModel model;
+  const InvitationListPage({super.key, required this.model});
 
   @override
   Widget build(BuildContext context) {
     RPLocalizations locale = RPLocalizations.of(context)!;
     return Scaffold(
       body: FutureBuilder<List<ActiveParticipationInvitation>>(
-          future: model.invitations,
+          future: bloc.backend.getInvitations(),
           builder: (context, snapshot) {
             Widget child;
 
@@ -50,16 +50,14 @@ class InvitationListPage extends StatelessWidget {
                   pinned: true,
                   stretch: true,
                   stretchTriggerOffset: 20,
-                  onStretchTrigger: () async {
-                    await model.invitations;
-                  },
+                  onStretchTrigger: () async => bloc.backend.getInvitations(),
                   leading: IconButton(
                     icon: const Icon(Icons.arrow_back),
                     onPressed: () {
                       if (context.canPop()) {
                         context.pop();
                       } else {
-                        context.go('/login');
+                        context.go(LoginPage.route);
                       }
                     },
                   ),
@@ -84,8 +82,8 @@ class InvitationCard extends StatelessWidget {
   Widget build(BuildContext context) => Card(
         child: InkWell(
           onTap: () {
-            context
-                .push('/invitation/${invitation.participation.participantId}');
+            context.push(
+                '${InvitationDetailsPage.route}/${invitation.participation.participantId}');
           },
           child: Padding(
             padding: const EdgeInsets.all(16.0),
diff --git a/lib/ui/pages/invitation_page.dart b/lib/ui/pages/invitation_page.dart
index 666fe5dd..6b63fa13 100644
--- a/lib/ui/pages/invitation_page.dart
+++ b/lib/ui/pages/invitation_page.dart
@@ -1,18 +1,20 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class InvitationDetailsPage extends StatelessWidget {
+  static const String route = '/invitation';
   final String invitationId;
+  final InvitationsViewModel model;
 
   const InvitationDetailsPage({
     super.key,
     required this.invitationId,
+    required this.model,
   });
 
   @override
   Widget build(BuildContext context) {
     RPLocalizations locale = RPLocalizations.of(context)!;
-    ActiveParticipationInvitation invitation = bloc.invitations.firstWhere(
-        (element) => element.participation.participantId == invitationId);
+    var invitation = model.getInvitation(invitationId);
 
     return Scaffold(
       appBar: AppBar(
@@ -56,7 +58,7 @@ class InvitationDetailsPage extends StatelessWidget {
                 child: ElevatedButton(
                   onPressed: () {
                     bloc.setStudyInvitation(invitation, context);
-                    context.push('/consent');
+                    context.push(InformedConsentPage.route);
                   },
                   style: ElevatedButton.styleFrom(
                     shape: const StadiumBorder(),
diff --git a/lib/ui/pages/loading_page.dart b/lib/ui/pages/loading_page.dart
deleted file mode 100644
index a9c5b639..00000000
--- a/lib/ui/pages/loading_page.dart
+++ /dev/null
@@ -1,46 +0,0 @@
-part of '../../main.dart';
-
-// class LoadingPage extends StatefulWidget {
-//   final String? redirectionOrigin;
-
-//   const LoadingPage({super.key, this.redirectionOrigin});
-
-//   @override
-//   LoadingPageState createState() => LoadingPageState();
-// }
-
-// class LoadingPageState extends State<LoadingPage> {
-//   @override
-//   initState() => super.initState();
-
-//   @override
-//   Widget build(BuildContext context) {
-//     // configure the BLOC if not already done or in progress
-//     // note that this build() method can be called several time, but we only
-//     // want the bloc to be configured once.
-//     //
-//     // the only reason to call it here - instead of in the initState() method -
-//     // is to have a handle to the context object, which is to be used in the
-//     // pop-up windows from CARP
-//     var redirectTo = widget.redirectionOrigin ?? 'tasks';
-//     if (!bloc.isConfiguring) {
-//       bloc.configure().then((_) {
-//         // when the configure is done, the localizations should have been downloaded
-//         // and we can ask the app to reload the translations
-//         CarpStudyApp.reloadLocale(context);
-
-//         // navigate to the right screen
-//         context.go((bloc.shouldInformedConsentBeShown)
-//             ? '/ConsentPage'
-//             : '/$redirectTo');
-//       });
-//     }
-//     return Scaffold(
-//         backgroundColor: Theme.of(context).scaffoldBackgroundColor,
-//         body: Center(
-//             child: Column(
-//           mainAxisSize: MainAxisSize.min,
-//           children: const [CircularProgressIndicator()],
-//         )));
-//   }
-// }
diff --git a/lib/ui/pages/login_page.dart b/lib/ui/pages/login_page.dart
new file mode 100644
index 00000000..65f635a5
--- /dev/null
+++ b/lib/ui/pages/login_page.dart
@@ -0,0 +1,70 @@
+part of carp_study_app;
+
+class LoginPage extends StatefulWidget {
+  static const String route = '/login';
+  const LoginPage({super.key});
+
+  @override
+  State<LoginPage> createState() => _LoginPageState();
+}
+
+class _LoginPageState extends State<LoginPage> {
+  final GlobalKey webViewKey = GlobalKey();
+
+  @override
+  Widget build(BuildContext context) {
+    RPLocalizations locale = RPLocalizations.of(context)!;
+    return Scaffold(
+        body: SafeArea(
+            child: Center(
+                child: Column(
+                    mainAxisAlignment: MainAxisAlignment.end,
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    children: [
+          Expanded(
+            child: Container(
+              margin: const EdgeInsets.symmetric(vertical: 32, horizontal: 56),
+              child: Image.asset(
+                'assets/carp_logo.png',
+                fit: BoxFit.contain,
+              ),
+            ),
+          ),
+          Container(
+            margin: const EdgeInsets.symmetric(vertical: 16, horizontal: 64),
+            width: MediaQuery.of(context).size.width,
+            height: 56,
+            decoration: BoxDecoration(
+              color: const Color(0xff006398),
+              borderRadius: BorderRadius.circular(100),
+            ),
+            child: TextButton(
+              onPressed: () async {
+                await bloc.backend.authenticate();
+                if (context.mounted) context.go('/');
+              },
+              child: Text(
+                locale.translate("pages.login.login"),
+                style: const TextStyle(color: Color(0xffffffff), fontSize: 22),
+                textAlign: TextAlign.center,
+              ),
+            ),
+          ),
+          if (bloc.backend.isAuthenticated)
+            TextButton(
+              onPressed: () {
+                showDialog<bool>(
+                  context: context,
+                  builder: (context) => const LogoutMessage(),
+                ).then((value) async {
+                  if (value == true) {
+                    await bloc.backend.signOut();
+                    setState(() {});
+                  }
+                });
+              },
+              child: Text(locale.translate('pages.login.logout')),
+            )
+        ]))));
+  }
+}
diff --git a/lib/ui/pages/message_details_page.dart b/lib/ui/pages/message_details_page.dart
index 1b74f4f8..ad7808f3 100644
--- a/lib/ui/pages/message_details_page.dart
+++ b/lib/ui/pages/message_details_page.dart
@@ -1,6 +1,7 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class MessageDetailsPage extends StatelessWidget {
+  static const String route = '/message';
   final String messageId;
 
   const MessageDetailsPage({
diff --git a/lib/ui/pages/process_message_page.dart b/lib/ui/pages/process_message_page.dart
index e057002d..559306c4 100644
--- a/lib/ui/pages/process_message_page.dart
+++ b/lib/ui/pages/process_message_page.dart
@@ -1,7 +1,13 @@
-part of '../../main.dart';
+part of carp_study_app;
+
+enum ProcessStatus {
+  done,
+  error,
+  other,
+}
 
 class ProcessMessagePage extends StatelessWidget {
-  // Type of message to display (e.g Error, Succes, Informative)
+  // Type of message to display (e.g Error, Success, Informative)
   final ProcessStatus statusType;
 
   // Message title
diff --git a/lib/ui/pages/profile_page.dart b/lib/ui/pages/profile_page.dart
index b9ae73fb..277c7a3d 100644
--- a/lib/ui/pages/profile_page.dart
+++ b/lib/ui/pages/profile_page.dart
@@ -1,6 +1,7 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class ProfilePage extends StatefulWidget {
+  static const String route = '/profile';
   final ProfilePageViewModel model;
   const ProfilePage(this.model, {super.key});
 
@@ -62,9 +63,9 @@ class ProfilePageState extends State<ProfilePage> {
                             style: profileSectionStyle.copyWith(
                                 color: Theme.of(context).primaryColor)),
                         Text(
-                          widget.model.userid,
+                          widget.model.userId,
                           style: profileTitleStyle,
-                          textScaleFactor: 0.75,
+                          textScaler: TextScaler.linear(0.75),
                         ),
                       ],
                     ),
@@ -113,7 +114,7 @@ class ProfilePageState extends State<ProfilePage> {
                         Text(
                           widget.model.studyDeploymentId,
                           style: profileTitleStyle,
-                          textScaleFactor: 0.75,
+                          textScaler: TextScaler.linear(0.75),
                         ),
                       ],
                     ),
@@ -213,10 +214,10 @@ class ProfilePageState extends State<ProfilePage> {
     } finally {}
   }
 
-  Future _showLogoutConfirmationDialog() {
+  Future<void> _showLogoutConfirmationDialog() {
     RPLocalizations locale = RPLocalizations.of(context)!;
 
-    return showDialog(
+    return showDialog<bool>(
       context: context,
       barrierDismissible: false,
       builder: (BuildContext context) {
@@ -243,10 +244,10 @@ class ProfilePageState extends State<ProfilePage> {
     });
   }
 
-  Future _showLeaveStudyConfirmationDialog() {
+  Future<void> _showLeaveStudyConfirmationDialog() {
     RPLocalizations locale = RPLocalizations.of(context)!;
 
-    return showDialog(
+    return showDialog<bool>(
       context: context,
       barrierDismissible: false,
       builder: (BuildContext context) {
@@ -266,7 +267,7 @@ class ProfilePageState extends State<ProfilePage> {
       },
     ).then((value) {
       if (value == true) {
-        bloc.leaveStudy().then((_) => context.go('/invitations'));
+        bloc.leaveStudy().then((_) => context.go(InvitationListPage.route));
       }
     });
   }
diff --git a/lib/ui/pages/study_details_page.dart b/lib/ui/pages/study_details_page.dart
index aed28cce..331e6bbf 100644
--- a/lib/ui/pages/study_details_page.dart
+++ b/lib/ui/pages/study_details_page.dart
@@ -1,23 +1,22 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class StudyDetailsPage extends StatelessWidget {
-  final StudyPageViewModel studyPageModel = StudyPageViewModel();
-
-  StudyDetailsPage({super.key});
+  static const String route = '/study_details';
+  final StudyPageViewModel model;
+  StudyDetailsPage({super.key, required this.model});
 
   @override
   Widget build(BuildContext context) {
     RPLocalizations locale = RPLocalizations.of(context)!;
 
-    String studyDescription() =>
-        '${locale.translate(studyPageModel.description)}\n\n'
-        '${locale.translate('widgets.study_card.title')}: "${locale.translate(studyPageModel.title)}".\n'
-        '${locale.translate('widgets.study_card.purpose')}: "${locale.translate(studyPageModel.purpose)}".\n\n'
+    String studyDescription() => '${locale.translate(model.description)}\n\n'
+        '${locale.translate('widgets.study_card.title')}: "${locale.translate(model.title)}".\n'
+        '${locale.translate('widgets.study_card.purpose')}: "${locale.translate(model.purpose)}".\n\n'
         '${locale.translate('widgets.study_card.responsibles')}:\n'
-        '${locale.translate(studyPageModel.piName)}, ${locale.translate(studyPageModel.piTitle)}\n\n'
-        '${locale.translate(studyPageModel.piAffiliation)}\n'
-        '${locale.translate(studyPageModel.piAddress)}\n'
-        '${locale.translate(studyPageModel.piEmail)}\n';
+        '${locale.translate(model.piName)}, ${locale.translate(model.piTitle)}\n\n'
+        '${locale.translate(model.piAffiliation)}\n'
+        '${locale.translate(model.piAddress)}\n'
+        '${locale.translate(model.piEmail)}\n';
 
     return Scaffold(
       body: Container(
@@ -36,13 +35,12 @@ class StudyDetailsPage extends StatelessWidget {
               Flexible(
                 child: ListView(
                   children: [
-                    DetailsBanner(
-                        studyPageModel.title, './assets/images/kids.png'),
+                    DetailsBanner(model.title, './assets/images/kids.png'),
                     Padding(
                       padding: const EdgeInsets.all(16),
                       child: Column(
                         children: [
-                          Text(locale.translate(studyPageModel.piAffiliation),
+                          Text(locale.translate(model.piAffiliation),
                               style: aboutCardSubtitleStyle.copyWith(
                                   color: Theme.of(context).primaryColor)),
                           Text(
@@ -63,8 +61,7 @@ class StudyDetailsPage extends StatelessWidget {
                   children: [
                     InkWell(
                       onTap: () async {
-                        String url =
-                            locale.translate(studyPageModel.privacyPolicyUrl);
+                        String url = locale.translate(model.privacyPolicyUrl);
                         try {
                           await launchUrl(Uri.parse(url));
                         } catch (error) {
@@ -85,8 +82,8 @@ class StudyDetailsPage extends StatelessWidget {
                     const SizedBox(width: 15),
                     InkWell(
                       onTap: () async {
-                        String url = locale
-                            .translate(studyPageModel.studyDescriptionUrl);
+                        String url =
+                            locale.translate(model.studyDescriptionUrl);
                         try {
                           await launchUrl(Uri.parse(url));
                         } catch (error) {
diff --git a/lib/ui/pages/study_page.dart b/lib/ui/pages/study_page.dart
index 25f25992..f995f934 100644
--- a/lib/ui/pages/study_page.dart
+++ b/lib/ui/pages/study_page.dart
@@ -1,8 +1,9 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class StudyPage extends StatefulWidget {
+  static const String route = '/study';
   final StudyPageViewModel model;
-  const StudyPage(this.model, {super.key});
+  const StudyPage({super.key, required this.model});
 
   @override
   StudyPageState createState() => StudyPageState();
@@ -35,7 +36,7 @@ class StudyPageState extends State<StudyPage> {
                               context,
                               widget.model.studyDescriptionMessage,
                               onTap: () {
-                                context.push('/studyDetails');
+                                context.push(StudyDetailsPage.route);
                               },
                             );
                           }
@@ -53,8 +54,11 @@ class StudyPageState extends State<StudyPage> {
     );
   }
 
-  Widget _aboutStudyCard(BuildContext context, Message message,
-      {Function? onTap}) {
+  Widget _aboutStudyCard(
+    BuildContext context,
+    Message message, {
+    Function? onTap,
+  }) {
     RPLocalizations locale = RPLocalizations.of(context)!;
 
     // Initialization the language of the tiemago package
@@ -67,7 +71,7 @@ class StudyPageState extends State<StudyPage> {
           if (onTap != null) {
             onTap();
           } else {
-            context.push('/message/${message.id}');
+            context.push('${MessageDetailsPage.route}/${message.id}');
           }
         },
         child: Padding(
diff --git a/lib/ui/pages/task_list_page.dart b/lib/ui/pages/task_list_page.dart
index d4b529e2..28eb72c1 100644
--- a/lib/ui/pages/task_list_page.dart
+++ b/lib/ui/pages/task_list_page.dart
@@ -1,8 +1,9 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class TaskListPage extends StatefulWidget {
+  static const String route = '/tasks';
   final TaskListPageViewModel model;
-  const TaskListPage(this.model, {super.key});
+  const TaskListPage({super.key, required this.model});
 
   @override
   TaskListPageState createState() => TaskListPageState();
@@ -96,32 +97,29 @@ class TaskListPageState extends State<TaskListPage> {
     return Center(
       child: StudiesCard(
         child: ListTile(
-          leading: CircleAvatar(
-            backgroundColor: Theme.of(context).hoverColor,
-            child: _taskTypeIcon(userTask),
-          ),
-          title: Text(locale.translate(userTask.title),
-              style: aboutCardTitleStyle.copyWith(
-                  color: Theme.of(context).primaryColor)),
-          subtitle: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              const SizedBox(height: 5),
-              Text(_subtitle(userTask),
-                  style: aboutCardSubtitleStyle.copyWith(
-                      color: Theme.of(context).primaryColor)),
-              const SizedBox(height: 5),
-              Text(locale.translate(userTask.description)),
-            ],
-          ),
-          onTap: () {
-            if (userTask.hasWidget) {
-              context.push('/task/${userTask.id}');
-            } else {
-              userTask.onStart();
-            }
-          },
-        ),
+            leading: CircleAvatar(
+              backgroundColor: Theme.of(context).hoverColor,
+              child: _taskTypeIcon(userTask),
+            ),
+            title: Text(locale.translate(userTask.title),
+                style: aboutCardTitleStyle.copyWith(
+                    color: Theme.of(context).primaryColor)),
+            subtitle: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                const SizedBox(height: 5),
+                Text(_subtitle(userTask),
+                    style: aboutCardSubtitleStyle.copyWith(
+                        color: Theme.of(context).primaryColor)),
+                const SizedBox(height: 5),
+                Text(locale.translate(userTask.description)),
+              ],
+            ),
+            onTap: () {
+              userTask.hasWidget
+                  ? context.push('/task/${userTask.id}')
+                  : userTask.onStart();
+            }),
       ),
     );
   }
@@ -255,7 +253,7 @@ class TaskListPageState extends State<TaskListPage> {
     ),
     BackgroundSensingUserTask.SENSING_TYPE: const Icon(
       Icons.settings_input_antenna,
-      color: CACHET.CACHET_BLUE,
+      color: CACHET.BLUE,
     ),
     BackgroundSensingUserTask.ONE_TIME_SENSING_TYPE: const Icon(
       Icons.settings_input_component,
diff --git a/lib/ui/widgets/battery_icon.dart b/lib/ui/widgets/battery_icon.dart
index d9164aed..1a3dae64 100644
--- a/lib/ui/widgets/battery_icon.dart
+++ b/lib/ui/widgets/battery_icon.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class BatteryPercentage extends StatelessWidget {
   const BatteryPercentage({
@@ -46,9 +46,7 @@ class BatteryPercentage extends StatelessWidget {
         ),
       ),
       const SizedBox(width: 4),
-      Text(
-        "$batteryLevel%",
-      )
+      Text("$batteryLevel%")
     ]);
   }
 }
diff --git a/lib/ui/widgets/carp_app_bar.dart b/lib/ui/widgets/carp_app_bar.dart
index db9c8cdc..8426f1ea 100644
--- a/lib/ui/widgets/carp_app_bar.dart
+++ b/lib/ui/widgets/carp_app_bar.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class CarpAppBar extends StatelessWidget {
   const CarpAppBar({super.key});
@@ -30,7 +30,7 @@ class CarpAppBar extends StatelessWidget {
                     ),
                     tooltip: 'Profile',
                     onPressed: () {
-                      context.push('/profile');
+                      context.push(ProfilePage.route);
                     },
                   ),
                 ],
diff --git a/lib/ui/widgets/charts_legend.dart b/lib/ui/widgets/charts_legend.dart
index a43adb26..1c17583f 100644
--- a/lib/ui/widgets/charts_legend.dart
+++ b/lib/ui/widgets/charts_legend.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class ChartsLegend extends StatelessWidget {
   final Icon? iconAssetName;
diff --git a/lib/ui/widgets/details_banner.dart b/lib/ui/widgets/details_banner.dart
index 20f42ddb..d0f4c06b 100644
--- a/lib/ui/widgets/details_banner.dart
+++ b/lib/ui/widgets/details_banner.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class DetailsBanner extends StatelessWidget {
   const DetailsBanner(this.title, this.imagePath, {super.key});
diff --git a/lib/ui/widgets/dialog_title.dart b/lib/ui/widgets/dialog_title.dart
index 243988fd..6563082e 100644
--- a/lib/ui/widgets/dialog_title.dart
+++ b/lib/ui/widgets/dialog_title.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class DialogTitle extends StatelessWidget {
   final String title;
diff --git a/lib/ui/widgets/horizontal_bar.dart b/lib/ui/widgets/horizontal_bar.dart
index 99cacb75..89e696b4 100644
--- a/lib/ui/widgets/horizontal_bar.dart
+++ b/lib/ui/widgets/horizontal_bar.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class HorizontalBar extends StatelessWidget {
   final List<String> names;
diff --git a/lib/ui/widgets/location_usage_dialog.dart b/lib/ui/widgets/location_usage_dialog.dart
index 503b273e..a6a905ef 100644
--- a/lib/ui/widgets/location_usage_dialog.dart
+++ b/lib/ui/widgets/location_usage_dialog.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class LocationUsageDialog {
   Widget build(BuildContext context, String message) {
diff --git a/lib/ui/widgets/logout_message.dart b/lib/ui/widgets/logout_message.dart
index 704937e6..d5cca8a2 100644
--- a/lib/ui/widgets/logout_message.dart
+++ b/lib/ui/widgets/logout_message.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class LogoutMessage extends StatelessWidget {
   const LogoutMessage({super.key});
diff --git a/lib/ui/widgets/studies_card.dart b/lib/ui/widgets/studies_card.dart
index 60b4c816..49e53c68 100644
--- a/lib/ui/widgets/studies_card.dart
+++ b/lib/ui/widgets/studies_card.dart
@@ -1,5 +1,6 @@
-part of '../../main.dart';
+part of carp_study_app;
 
+/// A [Card] for this app that makes all cards looks the same.
 class StudiesCard extends StatelessWidget {
   final Widget child;
   final double elevation;
diff --git a/lib/ui/widgets/study_card.dart b/lib/ui/widgets/study_card.dart
index cb92ce60..3d1870db 100644
--- a/lib/ui/widgets/study_card.dart
+++ b/lib/ui/widgets/study_card.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of carp_study_app;
 
 class StudyCard extends StatelessWidget {
   final StudyPageViewModel studyPageModel = StudyPageViewModel();
diff --git a/lib/view_models/data_visualization_page_model.dart b/lib/view_models/data_visualization_page_model.dart
index 4c9f11dc..74ef361e 100644
--- a/lib/view_models/data_visualization_page_model.dart
+++ b/lib/view_models/data_visualization_page_model.dart
@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of carp_study_app;
 
 class DataVisualizationPageViewModel extends ViewModel {
   final ActivityCardViewModel _activityCardDataModel = ActivityCardViewModel();
diff --git a/lib/view_models/devices_page_model.dart b/lib/view_models/device_view_models.dart
similarity index 68%
rename from lib/view_models/devices_page_model.dart
rename to lib/view_models/device_view_models.dart
index 30617a98..95dafd73 100644
--- a/lib/view_models/devices_page_model.dart
+++ b/lib/view_models/device_view_models.dart
@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of carp_study_app;
 
 enum DeviceType {
   phone,
@@ -7,25 +7,27 @@ enum DeviceType {
   scale,
   home,
   speaker,
-  heartrateMonitor,
+  heartrate,
   unknown,
 }
 
-class DevicesPageViewModel extends ViewModel {
-  final List<DeviceModel> _devices = [];
-  List<DeviceModel> get devices => _devices;
+/// The view model for the [DeviceListPage].
+class DeviceListPageViewModel extends ViewModel {
+  final List<DeviceViewModel> _devices = [];
+  List<DeviceViewModel> get devices => _devices;
 }
 
-class DeviceModel {
+/// The view model for each device - [DeviceManager].
+class DeviceViewModel extends ViewModel {
   DeviceManager deviceManager;
-  DeviceModel(this.deviceManager) : super();
+  DeviceViewModel(this.deviceManager) : super();
 
   String? get type => deviceManager.type;
   DeviceStatus get status => deviceManager.status;
   set status(DeviceStatus status) => deviceManager.status = status;
 
   /// Stream of [DeviceStatus] events
-  Stream<DeviceStatus> get deviceEvents => deviceManager.statusEvents;
+  Stream<DeviceStatus> get statusEvents => deviceManager.statusEvents;
 
   /// The device id
   String get id => deviceManager.id;
@@ -47,6 +49,14 @@ class DeviceModel {
       ? (deviceManager as HardwareDeviceManager).batteryLevel
       : null;
 
+  /// The stream of battery level events.
+  ///
+  /// Only relevant if this device is a [HardwareDeviceManager].
+  /// Returns an empty stream if not a hardware device.
+  Stream<int> get batteryEvents => deviceManager is HardwareDeviceManager
+      ? (deviceManager as HardwareDeviceManager).batteryEvents
+      : const Stream.empty();
+
   /// The icon for this type of device.
   Icon? get icon => deviceTypeIcon[type!];
 
@@ -88,13 +98,38 @@ class DeviceModel {
       };
 
   static Map<String, Icon> get deviceTypeIcon => {
-        Smartphone.DEVICE_TYPE: const Icon(Icons.phone_android, size: 30),
-        WeatherService.DEVICE_TYPE: const Icon(Icons.wb_cloudy),
-        AirQualityService.DEVICE_TYPE: const Icon(Icons.air),
-        LocationService.DEVICE_TYPE: const Icon(Icons.location_on),
-        ESenseDevice.DEVICE_TYPE: const Icon(Icons.headphones, size: 30),
-        PolarDevice.DEVICE_TYPE: const Icon(Icons.monitor_heart, size: 30),
-        HealthService.DEVICE_TYPE: const Icon(Icons.favorite_rounded, size: 30),
+        Smartphone.DEVICE_TYPE: const Icon(
+          Icons.phone_android,
+          size: 30,
+          color: CACHET.DARK_BLUE,
+        ),
+        WeatherService.DEVICE_TYPE: const Icon(
+          Icons.wb_cloudy,
+          color: CACHET.WHITE,
+        ),
+        AirQualityService.DEVICE_TYPE: const Icon(
+          Icons.air,
+          color: CACHET.GREY_1,
+        ),
+        LocationService.DEVICE_TYPE: const Icon(
+          Icons.location_on,
+          color: CACHET.GREEN,
+        ),
+        ESenseDevice.DEVICE_TYPE: const Icon(
+          Icons.headphones,
+          size: 30,
+          color: CACHET.BLACK,
+        ),
+        PolarDevice.DEVICE_TYPE: const Icon(
+          Icons.monitor_heart,
+          size: 30,
+          color: CACHET.RED,
+        ),
+        HealthService.DEVICE_TYPE: const Icon(
+          Icons.favorite_rounded,
+          size: 30,
+          color: CACHET.RED_1,
+        ),
       };
 
   static Map<DeviceStatus, dynamic> get deviceStatusIcon => {
@@ -142,29 +177,34 @@ class DeviceModel {
       };
 
   /// Map a selected device to the device in the protocol and connect to it.
-  void connectToDevice(BluetoothDevice selectedDevice, DeviceManager device) {
-    if (device is BTLEDeviceManager) {
-      device.btleAddress = selectedDevice.remoteId.str;
-      device.btleName = selectedDevice.platformName;
+  void connectToDevice(BluetoothDevice selectedDevice) {
+    if (deviceManager is BTLEDeviceManager) {
+      (deviceManager as BTLEDeviceManager).btleAddress =
+          selectedDevice.remoteId.str;
+      (deviceManager as BTLEDeviceManager).btleName =
+          selectedDevice.platformName;
     }
 
-    // when the device id is updated, save the deployment
     Sensing().controller?.saveDeployment();
-
-    device.connect();
+    deviceManager.connect();
   }
 
   // Disconnect from the currently connected device
-  void disconnectFromDevice(DeviceManager device) {
-    if (device is BTLEDeviceManager) {
-      device.btleAddress = '';
-      device.btleName = '';
+  Future<void> disconnectFromDevice() async {
+    if (deviceManager is BTLEDeviceManager) {
+      (deviceManager as BTLEDeviceManager).btleAddress = '';
+      (deviceManager as BTLEDeviceManager).btleName = '';
     }
 
-    // when the device id is updated, save the deployment
     Sensing().controller?.saveDeployment();
 
-    device.disconnect();
-    device.status = DeviceStatus.disconnected; // Force status update
+    try {
+      await deviceManager.disconnect();
+    } catch (error) {
+      warning(
+          "$runtimeType - Error disconnecting to device '${deviceManager.id}' - $error.");
+    }
+
+    // deviceManager.status = DeviceStatus.disconnected; // Force status update
   }
 }
diff --git a/lib/view_models/informed_consent_page_model.dart b/lib/view_models/informed_consent_page_model.dart
index 3f88ce58..a87c4672 100644
--- a/lib/view_models/informed_consent_page_model.dart
+++ b/lib/view_models/informed_consent_page_model.dart
@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of carp_study_app;
 
 class InformedConsentViewModel extends ViewModel {
   RPOrderedTask? _informedConsent;
diff --git a/lib/view_models/invitations_list_model.dart b/lib/view_models/invitations_list_model.dart
deleted file mode 100644
index b73f04ec..00000000
--- a/lib/view_models/invitations_list_model.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-part of '../main.dart';
-
-class InvitationsListViewModel extends ViewModel {
-  Future<List<ActiveParticipationInvitation>> get invitations async {
-    CarpParticipationService().configureFrom(CarpService());
-
-    bloc.invitations =
-        await CarpParticipationService().getActiveParticipationInvitations();
-
-    /// Filter the invitations to only include those that
-    /// have a smartphone as a device in [ActiveParticipationInvitation.assignedDevices] list
-    /// (i.e. the invitation is for a smartphone).
-    /// This is done to avoid showing invitations for other devices (e.g. [WebBrowser]).
-    bloc.invitations = bloc.invitations
-        .where((invitation) =>
-            invitation.assignedDevices
-                ?.any((device) => device.device is Smartphone) ??
-            false)
-        .toList();
-
-    return bloc.invitations;
-  }
-
-  InvitationsListViewModel();
-}
diff --git a/lib/view_models/invitations_view_model.dart b/lib/view_models/invitations_view_model.dart
new file mode 100644
index 00000000..f243ed4c
--- /dev/null
+++ b/lib/view_models/invitations_view_model.dart
@@ -0,0 +1,10 @@
+part of carp_study_app;
+
+class InvitationsViewModel extends ViewModel {
+  List<ActiveParticipationInvitation> get invitations =>
+      bloc.backend.invitations;
+
+  ActiveParticipationInvitation getInvitation(String invitationId) =>
+      invitations.firstWhere((invitation) =>
+          invitation.participation.participantId == invitationId);
+}
diff --git a/lib/view_models/profile_page_model.dart b/lib/view_models/profile_page_model.dart
index d02a42dc..447bedc3 100644
--- a/lib/view_models/profile_page_model.dart
+++ b/lib/view_models/profile_page_model.dart
@@ -1,11 +1,11 @@
-part of '../main.dart';
+part of carp_study_app;
 
 class ProfilePageViewModel extends ViewModel {
-  String get userid => bloc.user?.id ?? bloc.deployment?.userId ?? '';
+  String get userId => bloc.user?.id ?? bloc.deployment?.userId ?? '';
   String get username => bloc.user?.username ?? '';
-  String get firstname => bloc.user?.firstName ?? '';
-  String get lastname => bloc.user?.lastName ?? '';
-  String get name => '$firstname $lastname';
+  String get firstName => bloc.user?.firstName ?? '';
+  String get lastName => bloc.user?.lastName ?? '';
+  String get name => '$firstName $lastName';
   String get responsibleEmail =>
       bloc.deployment?.responsible?.email ?? 'cachet@dtu.dk';
   String get studyDeploymentId => bloc.deployment?.studyDeploymentId ?? '';
diff --git a/lib/view_models/study_page_model.dart b/lib/view_models/study_page_model.dart
index 1d892293..1536998e 100644
--- a/lib/view_models/study_page_model.dart
+++ b/lib/view_models/study_page_model.dart
@@ -1,5 +1,7 @@
-part of '../main.dart';
+part of carp_study_app;
 
+/// The view model for the [StudyPage]. Mainly holds the list of messages like
+/// news articles to be shown as part of the study.
 class StudyPageViewModel extends ViewModel {
   String get title => bloc.deployment?.studyDescription?.title ?? 'Unnamed';
   String get description =>
@@ -20,19 +22,6 @@ class StudyPageViewModel extends ViewModel {
       bloc.deployment?.responsible?.affiliation ??
       'Copenhagen Center for Health Technology';
 
-  /// Events on the state of the study executor
-  Stream<ExecutorState> get studyExecutorStateEvents =>
-      Sensing().controller!.executor.stateEvents;
-
-  /// Current state of the study executor (e.g., resumed, paused, ...)
-  ExecutorState get studyState => Sensing().controller!.executor.state;
-
-  /// Get all sensing events (i.e. all [DataPoint] objects being collected).
-  Stream<Measurement> get samplingEvents => Sensing().controller!.measurements;
-
-  /// The total sampling size so far since this study was started.
-  int get samplingSize => Sensing().controller!.samplingSize;
-
   /// The stream of messages (count)
   Stream<int> get messageStream => bloc.messageStream;
 
@@ -78,6 +67,4 @@ class StudyPageViewModel extends ViewModel {
         timestamp: DateTime.now(),
         image: 'assets/images/kids.png',
       );
-
-  StudyPageViewModel();
 }
diff --git a/lib/view_models/tasklist_page_model.dart b/lib/view_models/tasklist_page_model.dart
index 28a38918..de18fc84 100644
--- a/lib/view_models/tasklist_page_model.dart
+++ b/lib/view_models/tasklist_page_model.dart
@@ -1,5 +1,6 @@
-part of '../main.dart';
+part of carp_study_app;
 
+/// A view model for the [TaskListPage].
 class TaskListPageViewModel extends ViewModel {
   TaskListPageViewModel();
 
diff --git a/lib/view_models/user_tasks.dart b/lib/view_models/user_tasks.dart
index 5c414108..0d9d5b10 100644
--- a/lib/view_models/user_tasks.dart
+++ b/lib/view_models/user_tasks.dart
@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of carp_study_app;
 
 /// A [UserTaskFactory] that can handle the user tasks in this app.
 class AppUserTaskFactory implements UserTaskFactory {
diff --git a/lib/view_models/view_model.dart b/lib/view_models/view_model.dart
index 4a20679e..13882b24 100644
--- a/lib/view_models/view_model.dart
+++ b/lib/view_models/view_model.dart
@@ -1,7 +1,10 @@
-part of '../main.dart';
+part of carp_study_app;
 
-/// An abstract view model used for all other view models in the app.
-abstract class ViewModel {
+/// An abstract view model used for all view models in the app.
+///
+/// Note that a view model is a [ChangeNotifier] and will notify its listeners
+/// if changed, including any [ListenableBuilder] widgets.
+abstract class ViewModel extends ChangeNotifier {
   SmartphoneDeploymentController? _controller;
 
   SmartphoneDeploymentController? get controller => _controller;
@@ -9,8 +12,6 @@ abstract class ViewModel {
   /// Initialize this view model before use.
   @mustCallSuper
   void init(SmartphoneDeploymentController ctrl) {
-    debug('$runtimeType - init()');
-
     _controller = ctrl;
   }
 }
@@ -28,8 +29,12 @@ abstract class SerializableViewModel<D extends DataModel> extends ViewModel {
   ///
   /// The data model is either created using the [createModel] method or loaded
   /// from persistent storage.
-  D get model => _model!;
-  D? _model;
+  D get model => _model;
+  late D _model;
+
+  SerializableViewModel() {
+    _model = createModel();
+  }
 
   /// The [DataModel] to be serialized.
   ///
@@ -50,7 +55,10 @@ abstract class SerializableViewModel<D extends DataModel> extends ViewModel {
     _model = createModel();
 
     // restore the data model (if any saved)
-    restore().then((savedModel) => _model = savedModel ?? _model);
+    restore().then((savedModel) {
+      _model = savedModel ?? _model;
+      notifyListeners();
+    });
 
     // save the data model on a regular basis.
     Timer.periodic(const Duration(minutes: 3), (_) => save(model.toJson()));
@@ -79,7 +87,7 @@ abstract class SerializableViewModel<D extends DataModel> extends ViewModel {
     bool success = true;
     try {
       String name = (await filename);
-      info("Saving $runtimeType data to file '$name'.");
+      debug("Saving $runtimeType data to file '$name'.");
       File(name).writeAsStringSync(jsonEncode(json));
     } catch (exception) {
       success = false;
@@ -94,7 +102,7 @@ abstract class SerializableViewModel<D extends DataModel> extends ViewModel {
     bool success = true;
     try {
       String name = (await filename);
-      info("Deleting $runtimeType data to file '$name'.");
+      debug("Deleting $runtimeType data from file '$name'.");
       File(name).deleteSync();
     } catch (exception) {
       success = false;
@@ -103,11 +111,13 @@ abstract class SerializableViewModel<D extends DataModel> extends ViewModel {
     return success;
   }
 
+  /// Restore the [model] from persistent storage.
+  /// Returns null if unsuccessful.
   Future<D?> restore() async {
     D? result;
     try {
       String name = (await filename);
-      info("Restoring $runtimeType data from file '$name'.");
+      debug("Restoring $runtimeType data from file '$name'.");
       final jsonString = File(name).readAsStringSync();
       final modelAsJson = json.decode(jsonString) as Map<String, dynamic>;
       result = model.fromJson(modelAsJson) as D;
@@ -152,9 +162,9 @@ class CarpStudyAppViewModel extends ViewModel {
   final StudyPageViewModel _studyPageViewModel = StudyPageViewModel();
   final TaskListPageViewModel _taskListPageViewModel = TaskListPageViewModel();
   final ProfilePageViewModel _profilePageViewModel = ProfilePageViewModel();
-  final DevicesPageViewModel _devicesPageViewModel = DevicesPageViewModel();
-  final InvitationsListViewModel _invitationsListViewModel =
-      InvitationsListViewModel();
+  final DeviceListPageViewModel _devicesPageViewModel =
+      DeviceListPageViewModel();
+  final InvitationsViewModel _invitationsListViewModel = InvitationsViewModel();
   final InformedConsentViewModel _informedConsentViewModel =
       InformedConsentViewModel();
 
@@ -165,8 +175,8 @@ class CarpStudyAppViewModel extends ViewModel {
   StudyPageViewModel get studyPageViewModel => _studyPageViewModel;
   TaskListPageViewModel get taskListPageViewModel => _taskListPageViewModel;
   ProfilePageViewModel get profilePageViewModel => _profilePageViewModel;
-  DevicesPageViewModel get devicesPageViewModel => _devicesPageViewModel;
-  InvitationsListViewModel get invitationsListViewModel =>
+  DeviceListPageViewModel get devicesPageViewModel => _devicesPageViewModel;
+  InvitationsViewModel get invitationsListViewModel =>
       _invitationsListViewModel;
   InformedConsentViewModel get informedConsentViewModel =>
       _informedConsentViewModel;
diff --git a/pubspec.lock b/pubspec.lock
index a5d18152..0f9119bd 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -197,10 +197,10 @@ packages:
     dependency: transitive
     description:
       name: camera_avfoundation
-      sha256: "7d0763dfcbf060f56aa254a68c103210280bee9e97bbe4fdef23e257a4f70ab9"
+      sha256: "608b56b0880722f703871329c4d7d4c2f379c8e2936940851df7fc041abc6f51"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.14"
+    version: "0.9.13+10"
   camera_platform_interface:
     dependency: transitive
     description:
@@ -277,18 +277,18 @@ packages:
     dependency: "direct main"
     description:
       name: carp_mobile_sensing
-      sha256: "13c4269321777b48beb7f0022d4e1ef124329c3b3da412da523f46fe2e12f8d4"
+      sha256: "1bc8d19d1b528c87abbf0a7624f356f8c77b09d950c563fef41da4d78b02cd3a"
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.1"
+    version: "1.4.2"
   carp_polar_package:
     dependency: "direct main"
     description:
       name: carp_polar_package
-      sha256: "6956a7a5bc0144ae406bfc476d1c6e87dd5ce47153541fc9d0dddd148a977dee"
+      sha256: "11bc4ccbe9ad223fd0623fc5360967e819c00eb23db2525e03f883ade8a18aa2"
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.4.1"
   carp_serializable:
     dependency: "direct main"
     description:
@@ -541,10 +541,10 @@ packages:
     dependency: "direct main"
     description:
       name: fl_chart
-      sha256: "5a74434cc83bf64346efb562f1a06eefaf1bcb530dc3d96a104f631a1eff8d79"
+      sha256: b5e2b0f13d93f8c532b5a2786bfb44580de1f50b927bf95813fa1af617e9caf8
       url: "https://pub.dev"
     source: hosted
-    version: "0.65.0"
+    version: "0.66.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -562,10 +562,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_appauth
-      sha256: d2a14491357a9af09e65133bcf82a1cddb5463245c9645c5d532123c6e2a0735
+      sha256: "4ad7d446888b1486642226db6aa04ffb4651d76388715aba6e6e572ebeb915c3"
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.3"
+    version: "6.0.4"
   flutter_appauth_platform_interface:
     dependency: transitive
     description:
@@ -578,10 +578,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_blue_plus
-      sha256: "280fb9bd30fba07072e43c7ae77f1dc46cbfce2a4e426871565a88af60bb740d"
+      sha256: "3f7c5b9402919cfb16a6fc219adb9ed4ca2da77dceb9214732c77e58cf9569e8"
       url: "https://pub.dev"
     source: hosted
-    version: "1.31.10"
+    version: "1.31.12"
   flutter_launcher_icons:
     dependency: "direct main"
     description:
@@ -729,10 +729,10 @@ packages:
     dependency: "direct main"
     description:
       name: go_router
-      sha256: c5fa45fa502ee880839e3b2152d987c44abae26d064a2376d4aad434cf0f7b15
+      sha256: "07ee2436909f749d606f53521dc1725dd738dc5196e5ff815bc254253c594075"
       url: "https://pub.dev"
     source: hosted
-    version: "12.1.3"
+    version: "13.1.0"
   google_fonts:
     dependency: "direct main"
     description:
@@ -1534,18 +1534,18 @@ packages:
     dependency: transitive
     description:
       name: sqflite
-      sha256: c2c32eb0c74021d987336522acc3b6bf0082fbd0c540c36a9cf4ddb8ba891ddc
+      sha256: a9016f495c927cb90557c909ff26a6d92d9bd54fc42ba92e19d4e79d61e798c6
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
   sqflite_common:
     dependency: transitive
     description:
       name: sqflite_common
-      sha256: bb4738f15b23352822f4c42a531677e5c6f522e079461fd240ead29d8d8a54a6
+      sha256: "28d8c66baee4968519fb8bd6cdbedad982d6e53359091f0b74544a9f32ec72d5"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.0+2"
+    version: "2.5.3"
   stack_trace:
     dependency: transitive
     description:
@@ -1646,10 +1646,10 @@ packages:
     dependency: "direct main"
     description:
       name: timeago
-      sha256: c44b80cbc6b44627c00d76960f2af571f6f50e5dbedef4d9215d455e4335165b
+      sha256: d3204eb4c788214883380253da7f23485320a58c11d145babc82ad16bf4e7764
       url: "https://pub.dev"
     source: hosted
-    version: "3.6.0"
+    version: "3.6.1"
   timezone:
     dependency: transitive
     description:
@@ -1915,5 +1915,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.2.3 <4.0.0"
-  flutter: ">=3.16.6"
+  dart: ">=3.2.0 <4.0.0"
+  flutter: ">=3.16.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 2a50bf69..c019453c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: carp_study_app
 description: The generic CARP study app.
 publish_to: 'none'
-version: 1.2.0
+version: 1.4.0
 
 environment:
   sdk: ">=3.0.0 <4.0.0"
@@ -41,20 +41,50 @@ dependencies:
 
   flutter_localizations:
     sdk: flutter
-  fl_chart: ^0.65.0
+  fl_chart: ^0.66.0
   google_fonts: ^6.1.0
-  go_router: ^12.1.1
+  go_router: ^13.0.0
   flutter_svg: ^2.0.4
   flutter_blue_plus: ^1.15.5
   intl: ^0.18.1
   permission_handler: ^11.0.1
 
+# Overriding carp libraries to use the local copy
+dependency_overrides:
+  # carp_serializable:
+  #   path: ../../carp_serializable/
+  # carp_core:
+  #   path: ../../carp_core/
+  # carp_mobile_sensing:
+  #   path: ../carp/carp.sensing-flutter/carp_mobile_sensing/
+  # carp_context_package:
+  #   path: ../../packages/carp_context_package/
+  # carp_connectivity_package:
+  #   path: ../../packages/carp_connectivity_package/
+  # carp_communication_package:
+  #   path: ../../packages/carp_communication_package/
+  # carp_audio_package:
+  #   path: ../../packages/carp_audio_package/
+  # carp_apps_package:
+  #   path: ../../packages/carp_apps_package/
+  # carp_esense_package:
+  #   path: ../../packages/carp_esense_package/
+  # carp_polar_package:
+  #   path: ../carp/carp.sensing-flutter/packages/carp_polar_package/
+  # carp_movisens_package:
+  #   path: ../../packages/carp_movisens_package/
+  # carp_health_package:
+  #   path: ../../packages/carp_health_package/
+  # carp_backend:
+  #   path: ../carp/carp.sensing-flutter/backends/carp_backend/
+  # carp_webservices:
+  #   path: ../../backends/carp_webservices/
+
+
 dev_dependencies:
   # flutter_test:
   #   sdk: flutter
 
-  #  auto generate json code (.g files) with:
-  #    flutter pub run build_runner build --delete-conflicting-outputs
   test: any
   json_serializable: any
   build_runner: any
@@ -64,9 +94,6 @@ dev_dependencies:
 
   flutter_lints: any
 
-# For information on the generic Dart part of this file, see the
-# following page: https://dart.dev/tools/pub/pubspec
-
 # Is used to change the default app launch icons on iOS and Android.
 # To install:
 #  1. import the 'flutter_launcher_icons' package above
@@ -80,14 +107,9 @@ flutter_icons:
   image_path: "assets/logo.png"
   # image_path: "assets/app_icon.png"
 
-# The following section is specific to Flutter.
 flutter:
-  # The following line ensures that the Material Icons font is
-  # included with your application, so that you can use the icons in
-  # the material Icons class.
   uses-material-design: true
 
-  # To add assets to your application, add an assets section, like this:
   assets:
     - assets/images/
     - assets/instructions/
@@ -97,27 +119,5 @@ flutter:
     - assets/carp_logo.png
     - assets/logo.png
 
-  # An image asset can refer to one or more resolution-specific "variants", see
-  # https://flutter.dev/assets-and-images/#resolution-aware.
-
-  # For details regarding adding assets from package dependencies, see
-  # https://flutter.dev/assets-and-images/#from-packages
-
-  # To add custom fonts to your application, add a fonts section here,
-  # in this "flutter" section. Each entry in this list should have a
-  # "family" key with the font family name, and a "fonts" key with a
-  # list giving the asset and other descriptors for the font. For
-  # example:
-  #   - family: Schyler
-  #     fonts:
-  #       - asset: fonts/Schyler-Regular.ttf
-  #       - asset: fonts/Schyler-Italic.ttf
-  #         style: italic
-  #   - family: Trajan Pro
-  #     fonts:
-  #       - asset: fonts/TrajanPro.ttf
-  #       - asset: fonts/TrajanPro_Bold.ttf
-  #         weight: 700
-  #
-  # For details regarding fonts from package dependencies,
-  # see https://flutter.dev/custom-fonts/#from-packages
+  #  auto generate json code (.g files) with:
+  #    dart run build_runner build --delete-conflicting-outputs
diff --git a/test/heart_rate_data_model_test.dart b/test/heart_rate_data_model_test.dart
index 3d589727..c86c8461 100644
--- a/test/heart_rate_data_model_test.dart
+++ b/test/heart_rate_data_model_test.dart
@@ -52,7 +52,7 @@ void main() {
 
             heartRateStreamController.sink.add(mockMeasurement);
 
-            await Future.delayed(const Duration(milliseconds: 100));
+            await Future<void>.delayed(const Duration(milliseconds: 100));
             expect(viewModel.currentHeartRate, equals(80.0));
             expect(viewModel.dayMinMax, equals(HeartRateMinMaxPrHour(80, 80)));
             expect(
@@ -68,14 +68,14 @@ void main() {
 
             heartRateStreamController.sink.add(mockMeasurement);
 
-            await Future.delayed(const Duration(milliseconds: 100));
+            await Future<void>.delayed(const Duration(milliseconds: 100));
             when(mockPolarHRSample.hr).thenReturn(60);
             when(mockPolarHRDatum.samples).thenReturn([mockPolarHRSample]);
             when(mockMeasurement.data).thenReturn(mockPolarHRDatum);
 
             heartRateStreamController.sink.add(mockMeasurement);
 
-            await Future.delayed(const Duration(milliseconds: 100));
+            await Future<void>.delayed(const Duration(milliseconds: 100));
             expect(viewModel.currentHeartRate, equals(60));
             expect(viewModel.dayMinMax, equals(HeartRateMinMaxPrHour(60, 90)));
             expect(
@@ -93,7 +93,7 @@ void main() {
 
             heartRateStreamController.sink.add(mockMeasurement);
 
-            await Future.delayed(const Duration(milliseconds: 100));
+            await Future<void>.delayed(const Duration(milliseconds: 100));
             expect(viewModel.currentHeartRate, equals(null));
             expect(
                 viewModel.dayMinMax, equals(HeartRateMinMaxPrHour(null, null)));
@@ -111,7 +111,7 @@ void main() {
 
             heartRateStreamController.sink.add(mockMeasurement);
 
-            await Future.delayed(const Duration(milliseconds: 100));
+            await Future<void>.delayed(const Duration(milliseconds: 100));
             expect(viewModel.currentHeartRate, equals(anything));
             expect(viewModel.dayMinMax, equals(anything));
             expect(viewModel.hourlyHeartRate, equals(anything));
diff --git a/test/heart_rate_data_model_test.mocks.dart b/test/heart_rate_data_model_test.mocks.dart
index 5f41f189..d37a50d0 100644
--- a/test/heart_rate_data_model_test.mocks.dart
+++ b/test/heart_rate_data_model_test.mocks.dart
@@ -1,20 +1,24 @@
-// Mocks generated by Mockito 5.4.2 from annotations
+// Mocks generated by Mockito 5.4.4 from annotations
 // in carp_study_app/test/heart_rate_data_model_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i5;
+import 'dart:async' as _i6;
+import 'dart:ui' as _i7;
 
 import 'package:carp_core/carp_core.dart' as _i3;
 import 'package:carp_mobile_sensing/carp_mobile_sensing.dart' as _i2;
-import 'package:carp_polar_package/carp_polar_package.dart' as _i6;
+import 'package:carp_polar_package/carp_polar_package.dart' as _i8;
 import 'package:carp_study_app/main.dart' as _i4;
 import 'package:mockito/mockito.dart' as _i1;
+import 'package:mockito/src/dummies.dart' as _i5;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
 // ignore_for_file: avoid_setters_without_getters
 // ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
 // ignore_for_file: implementation_imports
 // ignore_for_file: invalid_use_of_visible_for_testing_member
 // ignore_for_file: prefer_const_constructors
@@ -134,6 +138,7 @@ class MockSmartphoneDeploymentController extends _i1.Mock
           Invocation.getter(#deviceRegistry),
         ),
       ) as _i2.DeviceController);
+
   @override
   _i2.SmartphoneDeploymentExecutor get executor => (super.noSuchMethod(
         Invocation.getter(#executor),
@@ -146,12 +151,20 @@ class MockSmartphoneDeploymentController extends _i1.Mock
           Invocation.getter(#executor),
         ),
       ) as _i2.SmartphoneDeploymentExecutor);
+
   @override
   String get privacySchemaName => (super.noSuchMethod(
         Invocation.getter(#privacySchemaName),
-        returnValue: '',
-        returnValueForMissingStub: '',
+        returnValue: _i5.dummyValue<String>(
+          this,
+          Invocation.getter(#privacySchemaName),
+        ),
+        returnValueForMissingStub: _i5.dummyValue<String>(
+          this,
+          Invocation.getter(#privacySchemaName),
+        ),
       ) as String);
+
   @override
   _i2.DataTransformer get transformer => (super.noSuchMethod(
         Invocation.getter(#transformer),
@@ -164,18 +177,21 @@ class MockSmartphoneDeploymentController extends _i1.Mock
           Invocation.getter(#transformer),
         ),
       ) as _i2.DataTransformer);
+
   @override
-  _i5.Stream<_i3.Measurement> get measurements => (super.noSuchMethod(
+  _i6.Stream<_i3.Measurement> get measurements => (super.noSuchMethod(
         Invocation.getter(#measurements),
-        returnValue: _i5.Stream<_i3.Measurement>.empty(),
-        returnValueForMissingStub: _i5.Stream<_i3.Measurement>.empty(),
-      ) as _i5.Stream<_i3.Measurement>);
+        returnValue: _i6.Stream<_i3.Measurement>.empty(),
+        returnValueForMissingStub: _i6.Stream<_i3.Measurement>.empty(),
+      ) as _i6.Stream<_i3.Measurement>);
+
   @override
   int get samplingSize => (super.noSuchMethod(
         Invocation.getter(#samplingSize),
         returnValue: 0,
         returnValueForMissingStub: 0,
       ) as int);
+
   @override
   set deployment(_i3.PrimaryDeviceDeployment? _deployment) =>
       super.noSuchMethod(
@@ -185,6 +201,7 @@ class MockSmartphoneDeploymentController extends _i1.Mock
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   set deviceRegistry(_i3.DeviceDataCollectorFactory? _deviceRegistry) =>
       super.noSuchMethod(
@@ -194,6 +211,7 @@ class MockSmartphoneDeploymentController extends _i1.Mock
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   _i3.DeploymentService get deploymentService => (super.noSuchMethod(
         Invocation.getter(#deploymentService),
@@ -206,6 +224,7 @@ class MockSmartphoneDeploymentController extends _i1.Mock
           Invocation.getter(#deploymentService),
         ),
       ) as _i3.DeploymentService);
+
   @override
   set deploymentService(_i3.DeploymentService? _deploymentService) =>
       super.noSuchMethod(
@@ -215,6 +234,7 @@ class MockSmartphoneDeploymentController extends _i1.Mock
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   set deploymentStatus(_i3.StudyDeploymentStatus? _deploymentStatus) =>
       super.noSuchMethod(
@@ -224,18 +244,21 @@ class MockSmartphoneDeploymentController extends _i1.Mock
         ),
         returnValueForMissingStub: null,
       );
+
   @override
-  _i5.Stream<_i3.StudyStatus> get statusEvents => (super.noSuchMethod(
+  _i6.Stream<_i3.StudyStatus> get statusEvents => (super.noSuchMethod(
         Invocation.getter(#statusEvents),
-        returnValue: _i5.Stream<_i3.StudyStatus>.empty(),
-        returnValueForMissingStub: _i5.Stream<_i3.StudyStatus>.empty(),
-      ) as _i5.Stream<_i3.StudyStatus>);
+        returnValue: _i6.Stream<_i3.StudyStatus>.empty(),
+        returnValueForMissingStub: _i6.Stream<_i3.StudyStatus>.empty(),
+      ) as _i6.Stream<_i3.StudyStatus>);
+
   @override
   _i3.StudyStatus get status => (super.noSuchMethod(
         Invocation.getter(#status),
         returnValue: _i3.StudyStatus.DeploymentNotStarted,
         returnValueForMissingStub: _i3.StudyStatus.DeploymentNotStarted,
       ) as _i3.StudyStatus);
+
   @override
   set status(_i3.StudyStatus? newStatus) => super.noSuchMethod(
         Invocation.setter(
@@ -244,24 +267,28 @@ class MockSmartphoneDeploymentController extends _i1.Mock
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   bool get isInitialized => (super.noSuchMethod(
         Invocation.getter(#isInitialized),
         returnValue: false,
         returnValueForMissingStub: false,
       ) as bool);
+
   @override
   bool get isDeployed => (super.noSuchMethod(
         Invocation.getter(#isDeployed),
         returnValue: false,
         returnValueForMissingStub: false,
       ) as bool);
+
   @override
   bool get isStopped => (super.noSuchMethod(
         Invocation.getter(#isStopped),
         returnValue: false,
         returnValueForMissingStub: false,
       ) as bool);
+
   @override
   List<_i3.DeviceConfiguration<_i3.DeviceRegistration>>
       get remainingDevicesToRegister => (super.noSuchMethod(
@@ -270,58 +297,64 @@ class MockSmartphoneDeploymentController extends _i1.Mock
             returnValueForMissingStub: <_i3
                 .DeviceConfiguration<_i3.DeviceRegistration>>[],
           ) as List<_i3.DeviceConfiguration<_i3.DeviceRegistration>>);
+
   @override
-  _i5.Stream<_i3.Measurement> measurementsByType(String? type) =>
+  _i6.Stream<_i3.Measurement> measurementsByType(String? type) =>
       (super.noSuchMethod(
         Invocation.method(
           #measurementsByType,
           [type],
         ),
-        returnValue: _i5.Stream<_i3.Measurement>.empty(),
-        returnValueForMissingStub: _i5.Stream<_i3.Measurement>.empty(),
-      ) as _i5.Stream<_i3.Measurement>);
+        returnValue: _i6.Stream<_i3.Measurement>.empty(),
+        returnValueForMissingStub: _i6.Stream<_i3.Measurement>.empty(),
+      ) as _i6.Stream<_i3.Measurement>);
+
   @override
-  _i5.Future<_i3.StudyStatus> tryDeployment({bool? useCached = true}) =>
+  _i6.Future<_i3.StudyStatus> tryDeployment({bool? useCached = true}) =>
       (super.noSuchMethod(
         Invocation.method(
           #tryDeployment,
           [],
           {#useCached: useCached},
         ),
-        returnValue: _i5.Future<_i3.StudyStatus>.value(
+        returnValue: _i6.Future<_i3.StudyStatus>.value(
             _i3.StudyStatus.DeploymentNotStarted),
-        returnValueForMissingStub: _i5.Future<_i3.StudyStatus>.value(
+        returnValueForMissingStub: _i6.Future<_i3.StudyStatus>.value(
             _i3.StudyStatus.DeploymentNotStarted),
-      ) as _i5.Future<_i3.StudyStatus>);
+      ) as _i6.Future<_i3.StudyStatus>);
+
   @override
-  _i5.Future<bool> saveDeployment() => (super.noSuchMethod(
+  _i6.Future<bool> saveDeployment() => (super.noSuchMethod(
         Invocation.method(
           #saveDeployment,
           [],
         ),
-        returnValue: _i5.Future<bool>.value(false),
-        returnValueForMissingStub: _i5.Future<bool>.value(false),
-      ) as _i5.Future<bool>);
+        returnValue: _i6.Future<bool>.value(false),
+        returnValueForMissingStub: _i6.Future<bool>.value(false),
+      ) as _i6.Future<bool>);
+
   @override
-  _i5.Future<bool> restoreDeployment() => (super.noSuchMethod(
+  _i6.Future<bool> restoreDeployment() => (super.noSuchMethod(
         Invocation.method(
           #restoreDeployment,
           [],
         ),
-        returnValue: _i5.Future<bool>.value(false),
-        returnValueForMissingStub: _i5.Future<bool>.value(false),
-      ) as _i5.Future<bool>);
+        returnValue: _i6.Future<bool>.value(false),
+        returnValueForMissingStub: _i6.Future<bool>.value(false),
+      ) as _i6.Future<bool>);
+
   @override
-  _i5.Future<void> eraseDeployment() => (super.noSuchMethod(
+  _i6.Future<void> eraseDeployment() => (super.noSuchMethod(
         Invocation.method(
           #eraseDeployment,
           [],
         ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
+
   @override
-  _i5.Future<void> configure({
+  _i6.Future<void> configure({
     _i2.DataEndPoint? dataEndPoint,
     _i2.DataTransformer? transformer,
   }) =>
@@ -334,9 +367,10 @@ class MockSmartphoneDeploymentController extends _i1.Mock
             #transformer: transformer,
           },
         ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
+
   @override
   void start([bool? start = true]) => super.noSuchMethod(
         Invocation.method(
@@ -345,24 +379,27 @@ class MockSmartphoneDeploymentController extends _i1.Mock
         ),
         returnValueForMissingStub: null,
       );
+
   @override
-  _i5.Future<void> stop() => (super.noSuchMethod(
+  _i6.Future<void> stop() => (super.noSuchMethod(
         Invocation.method(
           #stop,
           [],
         ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
+
   @override
-  _i5.Future<void> remove() => (super.noSuchMethod(
+  _i6.Future<void> remove() => (super.noSuchMethod(
         Invocation.method(
           #remove,
           [],
         ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
+
   @override
   void dispose() => super.noSuchMethod(
         Invocation.method(
@@ -371,8 +408,9 @@ class MockSmartphoneDeploymentController extends _i1.Mock
         ),
         returnValueForMissingStub: null,
       );
+
   @override
-  _i5.Future<void> addStudy(
+  _i6.Future<void> addStudy(
     _i3.Study? study,
     _i3.DeviceRegistration? deviceRegistration,
   ) =>
@@ -384,41 +422,44 @@ class MockSmartphoneDeploymentController extends _i1.Mock
             deviceRegistration,
           ],
         ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
+
   @override
-  _i5.Future<_i3.StudyDeploymentStatus?> getStudyDeploymentStatus() =>
+  _i6.Future<_i3.StudyDeploymentStatus?> getStudyDeploymentStatus() =>
       (super.noSuchMethod(
         Invocation.method(
           #getStudyDeploymentStatus,
           [],
         ),
-        returnValue: _i5.Future<_i3.StudyDeploymentStatus?>.value(),
+        returnValue: _i6.Future<_i3.StudyDeploymentStatus?>.value(),
         returnValueForMissingStub:
-            _i5.Future<_i3.StudyDeploymentStatus?>.value(),
-      ) as _i5.Future<_i3.StudyDeploymentStatus?>);
+            _i6.Future<_i3.StudyDeploymentStatus?>.value(),
+      ) as _i6.Future<_i3.StudyDeploymentStatus?>);
+
   @override
-  _i5.Future<void> tryRegisterConnectedDevice(
+  _i6.Future<void> tryRegisterConnectedDevice(
           _i3.DeviceConfiguration<_i3.DeviceRegistration>? device) =>
       (super.noSuchMethod(
         Invocation.method(
           #tryRegisterConnectedDevice,
           [device],
         ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
+
   @override
-  _i5.Future<void> tryRegisterRemainingDevicesToRegister() =>
+  _i6.Future<void> tryRegisterRemainingDevicesToRegister() =>
       (super.noSuchMethod(
         Invocation.method(
           #tryRegisterRemainingDevicesToRegister,
           [],
         ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
 }
 
 /// A class which mocks [HeartRateCardViewModel].
@@ -432,6 +473,7 @@ class MockHeartRateCardViewModel extends _i1.Mock
         returnValue: false,
         returnValueForMissingStub: false,
       ) as bool);
+
   @override
   set contactStatus(bool? _contactStatus) => super.noSuchMethod(
         Invocation.setter(
@@ -440,6 +482,7 @@ class MockHeartRateCardViewModel extends _i1.Mock
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   Map<int, _i4.HeartRateMinMaxPrHour> get hourlyHeartRate =>
       (super.noSuchMethod(
@@ -447,6 +490,7 @@ class MockHeartRateCardViewModel extends _i1.Mock
         returnValue: <int, _i4.HeartRateMinMaxPrHour>{},
         returnValueForMissingStub: <int, _i4.HeartRateMinMaxPrHour>{},
       ) as Map<int, _i4.HeartRateMinMaxPrHour>);
+
   @override
   _i4.HeartRateMinMaxPrHour get dayMinMax => (super.noSuchMethod(
         Invocation.getter(#dayMinMax),
@@ -459,6 +503,7 @@ class MockHeartRateCardViewModel extends _i1.Mock
           Invocation.getter(#dayMinMax),
         ),
       ) as _i4.HeartRateMinMaxPrHour);
+
   @override
   _i4.HourlyHeartRate get model => (super.noSuchMethod(
         Invocation.getter(#model),
@@ -471,12 +516,28 @@ class MockHeartRateCardViewModel extends _i1.Mock
           Invocation.getter(#model),
         ),
       ) as _i4.HourlyHeartRate);
+
   @override
-  _i5.Future<String> get filename => (super.noSuchMethod(
+  _i6.Future<String> get filename => (super.noSuchMethod(
         Invocation.getter(#filename),
-        returnValue: _i5.Future<String>.value(''),
-        returnValueForMissingStub: _i5.Future<String>.value(''),
-      ) as _i5.Future<String>);
+        returnValue: _i6.Future<String>.value(_i5.dummyValue<String>(
+          this,
+          Invocation.getter(#filename),
+        )),
+        returnValueForMissingStub:
+            _i6.Future<String>.value(_i5.dummyValue<String>(
+          this,
+          Invocation.getter(#filename),
+        )),
+      ) as _i6.Future<String>);
+
+  @override
+  bool get hasListeners => (super.noSuchMethod(
+        Invocation.getter(#hasListeners),
+        returnValue: false,
+        returnValueForMissingStub: false,
+      ) as bool);
+
   @override
   _i4.HourlyHeartRate createModel() => (super.noSuchMethod(
         Invocation.method(
@@ -498,43 +559,81 @@ class MockHeartRateCardViewModel extends _i1.Mock
           ),
         ),
       ) as _i4.HourlyHeartRate);
+
   @override
-  _i5.Future<void> init(_i2.SmartphoneDeploymentController? ctrl) =>
-      (super.noSuchMethod(
+  void init(_i2.SmartphoneDeploymentController? ctrl) => super.noSuchMethod(
         Invocation.method(
           #init,
           [ctrl],
         ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+        returnValueForMissingStub: null,
+      );
+
   @override
-  _i5.Future<bool> save(Map<String, dynamic>? json) => (super.noSuchMethod(
+  _i6.Future<bool> save(Map<String, dynamic>? json) => (super.noSuchMethod(
         Invocation.method(
           #save,
           [json],
         ),
-        returnValue: _i5.Future<bool>.value(false),
-        returnValueForMissingStub: _i5.Future<bool>.value(false),
-      ) as _i5.Future<bool>);
+        returnValue: _i6.Future<bool>.value(false),
+        returnValueForMissingStub: _i6.Future<bool>.value(false),
+      ) as _i6.Future<bool>);
+
   @override
-  _i5.Future<bool> delete() => (super.noSuchMethod(
+  _i6.Future<bool> delete() => (super.noSuchMethod(
         Invocation.method(
           #delete,
           [],
         ),
-        returnValue: _i5.Future<bool>.value(false),
-        returnValueForMissingStub: _i5.Future<bool>.value(false),
-      ) as _i5.Future<bool>);
+        returnValue: _i6.Future<bool>.value(false),
+        returnValueForMissingStub: _i6.Future<bool>.value(false),
+      ) as _i6.Future<bool>);
+
   @override
-  _i5.Future<_i4.HourlyHeartRate?> restore() => (super.noSuchMethod(
+  _i6.Future<_i4.HourlyHeartRate?> restore() => (super.noSuchMethod(
         Invocation.method(
           #restore,
           [],
         ),
-        returnValue: _i5.Future<_i4.HourlyHeartRate?>.value(),
-        returnValueForMissingStub: _i5.Future<_i4.HourlyHeartRate?>.value(),
-      ) as _i5.Future<_i4.HourlyHeartRate?>);
+        returnValue: _i6.Future<_i4.HourlyHeartRate?>.value(),
+        returnValueForMissingStub: _i6.Future<_i4.HourlyHeartRate?>.value(),
+      ) as _i6.Future<_i4.HourlyHeartRate?>);
+
+  @override
+  void addListener(_i7.VoidCallback? listener) => super.noSuchMethod(
+        Invocation.method(
+          #addListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  void removeListener(_i7.VoidCallback? listener) => super.noSuchMethod(
+        Invocation.method(
+          #removeListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  void dispose() => super.noSuchMethod(
+        Invocation.method(
+          #dispose,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  void notifyListeners() => super.noSuchMethod(
+        Invocation.method(
+          #notifyListeners,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
 }
 
 /// A class which mocks [HourlyHeartRate].
@@ -548,6 +647,7 @@ class MockHourlyHeartRate extends _i1.Mock implements _i4.HourlyHeartRate {
         returnValue: <int, _i4.HeartRateMinMaxPrHour>{},
         returnValueForMissingStub: <int, _i4.HeartRateMinMaxPrHour>{},
       ) as Map<int, _i4.HeartRateMinMaxPrHour>);
+
   @override
   set hourlyHeartRate(Map<int, _i4.HeartRateMinMaxPrHour>? _hourlyHeartRate) =>
       super.noSuchMethod(
@@ -557,6 +657,7 @@ class MockHourlyHeartRate extends _i1.Mock implements _i4.HourlyHeartRate {
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   DateTime get lastUpdated => (super.noSuchMethod(
         Invocation.getter(#lastUpdated),
@@ -569,6 +670,7 @@ class MockHourlyHeartRate extends _i1.Mock implements _i4.HourlyHeartRate {
           Invocation.getter(#lastUpdated),
         ),
       ) as DateTime);
+
   @override
   set lastUpdated(DateTime? _lastUpdated) => super.noSuchMethod(
         Invocation.setter(
@@ -577,6 +679,7 @@ class MockHourlyHeartRate extends _i1.Mock implements _i4.HourlyHeartRate {
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   set currentHeartRate(double? _currentHeartRate) => super.noSuchMethod(
         Invocation.setter(
@@ -585,6 +688,7 @@ class MockHourlyHeartRate extends _i1.Mock implements _i4.HourlyHeartRate {
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   set maxHeartRate(double? _maxHeartRate) => super.noSuchMethod(
         Invocation.setter(
@@ -593,6 +697,7 @@ class MockHourlyHeartRate extends _i1.Mock implements _i4.HourlyHeartRate {
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   set minHeartRate(double? _minHeartRate) => super.noSuchMethod(
         Invocation.setter(
@@ -601,6 +706,7 @@ class MockHourlyHeartRate extends _i1.Mock implements _i4.HourlyHeartRate {
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   _i4.HourlyHeartRate resetDataAtMidnight() => (super.noSuchMethod(
         Invocation.method(
@@ -622,6 +728,7 @@ class MockHourlyHeartRate extends _i1.Mock implements _i4.HourlyHeartRate {
           ),
         ),
       ) as _i4.HourlyHeartRate);
+
   @override
   _i4.HourlyHeartRate addHeartRate(
     int? hour,
@@ -656,6 +763,7 @@ class MockHourlyHeartRate extends _i1.Mock implements _i4.HourlyHeartRate {
           ),
         ),
       ) as _i4.HourlyHeartRate);
+
   @override
   _i4.HourlyHeartRate fromJson(Map<String, dynamic>? json) =>
       (super.noSuchMethod(
@@ -678,6 +786,7 @@ class MockHourlyHeartRate extends _i1.Mock implements _i4.HourlyHeartRate {
           ),
         ),
       ) as _i4.HourlyHeartRate);
+
   @override
   Map<String, dynamic> toJson() => (super.noSuchMethod(
         Invocation.method(
@@ -692,31 +801,35 @@ class MockHourlyHeartRate extends _i1.Mock implements _i4.HourlyHeartRate {
 /// A class which mocks [PolarHRSample].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockPolarHRSample extends _i1.Mock implements _i6.PolarHRSample {
+class MockPolarHRSample extends _i1.Mock implements _i8.PolarHRSample {
   @override
   int get hr => (super.noSuchMethod(
         Invocation.getter(#hr),
         returnValue: 0,
         returnValueForMissingStub: 0,
       ) as int);
+
   @override
   List<int> get rrsMs => (super.noSuchMethod(
         Invocation.getter(#rrsMs),
         returnValue: <int>[],
         returnValueForMissingStub: <int>[],
       ) as List<int>);
+
   @override
   bool get contactStatus => (super.noSuchMethod(
         Invocation.getter(#contactStatus),
         returnValue: false,
         returnValueForMissingStub: false,
       ) as bool);
+
   @override
   bool get contactStatusSupported => (super.noSuchMethod(
         Invocation.getter(#contactStatusSupported),
         returnValue: false,
         returnValueForMissingStub: false,
       ) as bool);
+
   @override
   Map<String, dynamic> toJson() => (super.noSuchMethod(
         Invocation.method(
@@ -731,25 +844,34 @@ class MockPolarHRSample extends _i1.Mock implements _i6.PolarHRSample {
 /// A class which mocks [PolarHR].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockPolarHR extends _i1.Mock implements _i6.PolarHR {
+class MockPolarHR extends _i1.Mock implements _i8.PolarHR {
   @override
   Function get fromJsonFunction => (super.noSuchMethod(
         Invocation.getter(#fromJsonFunction),
         returnValue: () {},
         returnValueForMissingStub: () {},
       ) as Function);
+
   @override
   String get jsonType => (super.noSuchMethod(
         Invocation.getter(#jsonType),
-        returnValue: '',
-        returnValueForMissingStub: '',
+        returnValue: _i5.dummyValue<String>(
+          this,
+          Invocation.getter(#jsonType),
+        ),
+        returnValueForMissingStub: _i5.dummyValue<String>(
+          this,
+          Invocation.getter(#jsonType),
+        ),
       ) as String);
+
   @override
-  List<_i6.PolarHRSample> get samples => (super.noSuchMethod(
+  List<_i8.PolarHRSample> get samples => (super.noSuchMethod(
         Invocation.getter(#samples),
-        returnValue: <_i6.PolarHRSample>[],
-        returnValueForMissingStub: <_i6.PolarHRSample>[],
-      ) as List<_i6.PolarHRSample>);
+        returnValue: <_i8.PolarHRSample>[],
+        returnValueForMissingStub: <_i8.PolarHRSample>[],
+      ) as List<_i8.PolarHRSample>);
+
   @override
   set sensorSpecificData(_i3.Data? _sensorSpecificData) => super.noSuchMethod(
         Invocation.setter(
@@ -758,6 +880,7 @@ class MockPolarHR extends _i1.Mock implements _i6.PolarHR {
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   _i3.DataType get format => (super.noSuchMethod(
         Invocation.getter(#format),
@@ -770,6 +893,7 @@ class MockPolarHR extends _i1.Mock implements _i6.PolarHR {
           Invocation.getter(#format),
         ),
       ) as _i3.DataType);
+
   @override
   set $type(String? _$type) => super.noSuchMethod(
         Invocation.setter(
@@ -778,6 +902,7 @@ class MockPolarHR extends _i1.Mock implements _i6.PolarHR {
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   Map<String, dynamic> toJson() => (super.noSuchMethod(
         Invocation.method(
@@ -787,6 +912,7 @@ class MockPolarHR extends _i1.Mock implements _i6.PolarHR {
         returnValue: <String, dynamic>{},
         returnValueForMissingStub: <String, dynamic>{},
       ) as Map<String, dynamic>);
+
   @override
   bool equivalentTo(_i3.Data? other) => (super.noSuchMethod(
         Invocation.method(
@@ -808,6 +934,7 @@ class MockMeasurement extends _i1.Mock implements _i3.Measurement {
         returnValue: 0,
         returnValueForMissingStub: 0,
       ) as int);
+
   @override
   set sensorStartTime(int? _sensorStartTime) => super.noSuchMethod(
         Invocation.setter(
@@ -816,6 +943,7 @@ class MockMeasurement extends _i1.Mock implements _i3.Measurement {
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   set sensorEndTime(int? _sensorEndTime) => super.noSuchMethod(
         Invocation.setter(
@@ -824,6 +952,7 @@ class MockMeasurement extends _i1.Mock implements _i3.Measurement {
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   set taskControl(_i3.TaskControl? _taskControl) => super.noSuchMethod(
         Invocation.setter(
@@ -832,6 +961,7 @@ class MockMeasurement extends _i1.Mock implements _i3.Measurement {
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   _i3.Data get data => (super.noSuchMethod(
         Invocation.getter(#data),
@@ -844,6 +974,7 @@ class MockMeasurement extends _i1.Mock implements _i3.Measurement {
           Invocation.getter(#data),
         ),
       ) as _i3.Data);
+
   @override
   set data(_i3.Data? _data) => super.noSuchMethod(
         Invocation.setter(
@@ -852,6 +983,7 @@ class MockMeasurement extends _i1.Mock implements _i3.Measurement {
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   _i3.DataType get dataType => (super.noSuchMethod(
         Invocation.getter(#dataType),
@@ -864,6 +996,7 @@ class MockMeasurement extends _i1.Mock implements _i3.Measurement {
           Invocation.getter(#dataType),
         ),
       ) as _i3.DataType);
+
   @override
   Map<String, dynamic> toJson() => (super.noSuchMethod(
         Invocation.method(
@@ -900,6 +1033,7 @@ class MockDataModel extends _i1.Mock implements _i4.DataModel {
           ),
         ),
       ) as _i4.DataModel);
+
   @override
   Map<String, dynamic> toJson() => (super.noSuchMethod(
         Invocation.method(