diff --git a/lib/database/database.dart b/lib/database/database.dart
index 10474b8..2f81885 100644
--- a/lib/database/database.dart
+++ b/lib/database/database.dart
@@ -7,12 +7,6 @@ class Database{
 
   Database._init();
 
-  Future<Database> get database async {
-    if (_database != null) return _database!;
-    _database = await _initDB('database.db');
-
-    return _database!;
-  }
 
   Future _createDB(Database database) async{
     const integerPrimaryKeyAutoincrement = 'INTEGER PRIMARY KEY AUTOINCREMENT';
diff --git a/lib/main.dart b/lib/main.dart
index cbaaa02..06709ad 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'myApp.dart';
+import '../myApp.dart';
 
 void main() {
   runApp(MyApp());
-}
+}
\ No newline at end of file
diff --git a/lib/model/note.dart b/lib/model/note.dart
index df6bed2..ae3d498 100644
--- a/lib/model/note.dart
+++ b/lib/model/note.dart
@@ -8,4 +8,7 @@ class Note extends BaseEntity {
   static String creationDate = BaseEntity.getCreationDate;
   static String lastModificationDate = BaseEntity.getLastEditDate;
   static String description = '';
+  Map<String, dynamic> toMap() {
+    return {'id': id, 'title': title, 'desc': description,'CreationDate': creationDate, 'lastM': lastModificationDate };
+  }
 }
diff --git a/lib/navigation.dart b/lib/navigation.dart
index 180a383..80bbc5f 100644
--- a/lib/navigation.dart
+++ b/lib/navigation.dart
@@ -1,5 +1,3 @@
-import 'dart:ffi';
-
 import 'package:flutter/material.dart';
 import 'pages/testUI.dart';
 import 'pages/TodayView.dart';
diff --git a/lib/pages/InboxView.dart b/lib/pages/InboxView.dart
index 4d40bd7..e553fbc 100644
--- a/lib/pages/InboxView.dart
+++ b/lib/pages/InboxView.dart
@@ -10,10 +10,16 @@ class InboxView extends StatefulWidget {
 class _InboxViewState extends State<InboxView> {
   @override
   Widget build(BuildContext context) {
-    return const Scaffold(
-        body: Center(
-          child: Icon(Icons.inbox),
-        )
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Inbox'),
+      ),
+      floatingActionButton: FloatingActionButton(
+        onPressed: () {
+        },
+        child: Icon(Icons.add),
+      ),
+
     );
   }
 }
diff --git a/lib/pages/NotesView.dart b/lib/pages/NotesView.dart
index b0d7c4b..70ccb07 100644
--- a/lib/pages/NotesView.dart
+++ b/lib/pages/NotesView.dart
@@ -13,7 +13,9 @@ class _NotesViewState extends State<NotesView> {
     return const Scaffold(
         body: Center(
           child: Icon(Icons.note),
-        )
+        ),
+      
     );
+
   }
 }
diff --git a/test/widget_test.dart b/test/widget_test.dart
index bb5dffa..1c66089 100644
--- a/test/widget_test.dart
+++ b/test/widget_test.dart
@@ -8,12 +8,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import 'package:progetto_m335_flutter/myApp.dart';
+import 'package:progetto_m335_flutter/main.dart';
 
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {
     // Build our app and trigger a frame.
-    await tester.pumpWidget(const MyApp());
 
     // Verify that our counter starts at 0.
     expect(find.text('0'), findsOneWidget);