diff --git a/refilc_mobile_ui/lib/pages/home/live_card/live_card.dart b/refilc_mobile_ui/lib/pages/home/live_card/live_card.dart
index 86fb946..a4a3638 100644
--- a/refilc_mobile_ui/lib/pages/home/live_card/live_card.dart
+++ b/refilc_mobile_ui/lib/pages/home/live_card/live_card.dart
@@ -3,10 +3,10 @@ import 'package:refilc/api/providers/user_provider.dart';
 import 'package:refilc/helpers/subject.dart';
 import 'package:refilc/icons/filc_icons.dart';
 import 'package:refilc/models/settings.dart';
-import 'package:refilc_kreta_api/models/category.dart';
-import 'package:refilc_kreta_api/models/lesson.dart';
-import 'package:refilc_kreta_api/models/subject.dart';
-import 'package:refilc_kreta_api/models/teacher.dart';
+// import 'package:refilc_kreta_api/models/category.dart';
+// import 'package:refilc_kreta_api/models/lesson.dart';
+// import 'package:refilc_kreta_api/models/subject.dart';
+// import 'package:refilc_kreta_api/models/teacher.dart';
 import 'package:refilc_mobile_ui/common/splitted_panel/splitted_panel.dart';
 import 'package:refilc_mobile_ui/pages/home/live_card/heads_up_countdown.dart';
 import 'package:refilc_mobile_ui/pages/home/live_card/segmented_countdown.dart';
diff --git a/refilc_mobile_ui/lib/pages/notes/notes_page.dart b/refilc_mobile_ui/lib/pages/notes/notes_page.dart
index 58e356b..ef814c3 100644
--- a/refilc_mobile_ui/lib/pages/notes/notes_page.dart
+++ b/refilc_mobile_ui/lib/pages/notes/notes_page.dart
@@ -22,9 +22,9 @@ import 'package:refilc_mobile_ui/common/soon_alert/soon_alert.dart';
 import 'package:refilc_mobile_ui/common/widgets/tick_tile.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:refilc_mobile_ui/screens/notes/add_note_screen.dart';
-import 'package:refilc_mobile_ui/screens/notes/note_view_screen.dart';
-import 'package:refilc_mobile_ui/screens/notes/self_note_tile.dart';
+import 'package:refilc_mobile_ui/pages/notes/submenu/add_note_screen.dart';
+import 'package:refilc_mobile_ui/pages/notes/submenu/note_view_screen.dart';
+import 'package:refilc_mobile_ui/pages/notes/submenu/self_note_tile.dart';
 import 'package:refilc_plus/models/premium_scopes.dart';
 import 'package:refilc_plus/providers/plus_provider.dart';
 import 'package:refilc_plus/ui/mobile/plus/premium_inline.dart';
diff --git a/refilc_mobile_ui/lib/screens/notes/add_note_screen.dart b/refilc_mobile_ui/lib/pages/notes/submenu/add_note_screen.dart
similarity index 97%
rename from refilc_mobile_ui/lib/screens/notes/add_note_screen.dart
rename to refilc_mobile_ui/lib/pages/notes/submenu/add_note_screen.dart
index 0952bde..4020acc 100644
--- a/refilc_mobile_ui/lib/screens/notes/add_note_screen.dart
+++ b/refilc_mobile_ui/lib/pages/notes/submenu/add_note_screen.dart
@@ -6,7 +6,7 @@ import 'package:refilc/api/providers/user_provider.dart';
 import 'package:refilc/models/self_note.dart';
 import 'package:refilc/theme/colors/colors.dart';
 import 'package:refilc_kreta_api/providers/homework_provider.dart';
-import 'package:refilc_mobile_ui/screens/notes/notes_screen.i18n.dart';
+import 'package:refilc_mobile_ui/pages/notes/submenu/notes_screen.i18n.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';
 import 'package:provider/provider.dart';
@@ -98,7 +98,7 @@ class AddNoteScreenState extends State<AddNoteScreen> {
                 }
               },
               child: Container(
-                color: Theme.of(context).colorScheme.primary.withOpacity(0.4),
+                color: Theme.of(context).colorScheme.secondary.withOpacity(0.2),
                 child: Padding(
                   padding: const EdgeInsets.all(8.0),
                   child: Stack(
diff --git a/refilc_mobile_ui/lib/screens/notes/note_view_screen.dart b/refilc_mobile_ui/lib/pages/notes/submenu/note_view_screen.dart
similarity index 95%
rename from refilc_mobile_ui/lib/screens/notes/note_view_screen.dart
rename to refilc_mobile_ui/lib/pages/notes/submenu/note_view_screen.dart
index 45ac18e..bb647f4 100644
--- a/refilc_mobile_ui/lib/screens/notes/note_view_screen.dart
+++ b/refilc_mobile_ui/lib/pages/notes/submenu/note_view_screen.dart
@@ -1,7 +1,7 @@
 import 'package:refilc/api/providers/self_note_provider.dart';
 import 'package:refilc/models/self_note.dart';
 import 'package:refilc/theme/colors/colors.dart';
-import 'package:refilc_mobile_ui/screens/notes/add_note_screen.dart';
+import 'package:refilc_mobile_ui/pages/notes/submenu/add_note_screen.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';
@@ -47,7 +47,7 @@ class NoteViewScreenState extends State<NoteViewScreen> {
                             AddNoteScreen(initialNote: widget.note)));
               },
               child: Container(
-                color: Theme.of(context).colorScheme.primary.withOpacity(0.4),
+                color: Theme.of(context).colorScheme.secondary.withOpacity(0.2),
                 child: Padding(
                   padding: const EdgeInsets.all(8.0),
                   child: Stack(
@@ -95,7 +95,7 @@ class NoteViewScreenState extends State<NoteViewScreen> {
                 Navigator.of(context).pop();
               },
               child: Container(
-                color: Theme.of(context).colorScheme.primary.withOpacity(0.4),
+                color: Theme.of(context).colorScheme.secondary.withOpacity(0.2),
                 child: Padding(
                   padding: const EdgeInsets.all(8.0),
                   child: Stack(
diff --git a/refilc_mobile_ui/lib/screens/notes/notes_screen.dart b/refilc_mobile_ui/lib/pages/notes/submenu/notes_screen.dart
similarity index 95%
rename from refilc_mobile_ui/lib/screens/notes/notes_screen.dart
rename to refilc_mobile_ui/lib/pages/notes/submenu/notes_screen.dart
index f27e889..8f2795a 100644
--- a/refilc_mobile_ui/lib/screens/notes/notes_screen.dart
+++ b/refilc_mobile_ui/lib/pages/notes/submenu/notes_screen.dart
@@ -11,10 +11,10 @@ import 'package:refilc_mobile_ui/common/empty.dart';
 import 'package:refilc_mobile_ui/common/panel/panel.dart';
 import 'package:refilc_mobile_ui/common/soon_alert/soon_alert.dart';
 import 'package:refilc_mobile_ui/common/widgets/tick_tile.dart';
-import 'package:refilc_mobile_ui/screens/notes/add_note_screen.dart';
-import 'package:refilc_mobile_ui/screens/notes/note_view_screen.dart';
-import 'package:refilc_mobile_ui/screens/notes/notes_screen.i18n.dart';
-import 'package:refilc_mobile_ui/screens/notes/self_note_tile.dart';
+import 'package:refilc_mobile_ui/pages/notes/submenu/add_note_screen.dart';
+import 'package:refilc_mobile_ui/pages/notes/submenu/note_view_screen.dart';
+import 'package:refilc_mobile_ui/pages/notes/submenu/notes_screen.i18n.dart';
+import 'package:refilc_mobile_ui/pages/notes/submenu/self_note_tile.dart';
 import 'package:refilc_plus/models/premium_scopes.dart';
 import 'package:refilc_plus/providers/plus_provider.dart';
 import 'package:refilc_plus/ui/mobile/plus/premium_inline.dart';
@@ -173,7 +173,7 @@ class NotesScreenState extends State<NotesScreen> {
                 SoonAlert.show(context: context);
               },
               child: Container(
-                color: Theme.of(context).colorScheme.primary.withOpacity(0.4),
+                color: Theme.of(context).colorScheme.secondary.withOpacity(0.2),
                 child: Padding(
                   padding: const EdgeInsets.all(8.0),
                   child: Stack(
@@ -225,7 +225,7 @@ class NotesScreenState extends State<NotesScreen> {
                         builder: (context) => const AddNoteScreen()));
               },
               child: Container(
-                color: Theme.of(context).colorScheme.primary.withOpacity(0.4),
+                color: Theme.of(context).colorScheme.secondary.withOpacity(0.2),
                 child: Padding(
                   padding: const EdgeInsets.all(8.0),
                   child: Stack(
diff --git a/refilc_mobile_ui/lib/screens/notes/notes_screen.i18n.dart b/refilc_mobile_ui/lib/pages/notes/submenu/notes_screen.i18n.dart
similarity index 100%
rename from refilc_mobile_ui/lib/screens/notes/notes_screen.i18n.dart
rename to refilc_mobile_ui/lib/pages/notes/submenu/notes_screen.i18n.dart
diff --git a/refilc_mobile_ui/lib/screens/notes/self_note_tile.dart b/refilc_mobile_ui/lib/pages/notes/submenu/self_note_tile.dart
similarity index 100%
rename from refilc_mobile_ui/lib/screens/notes/self_note_tile.dart
rename to refilc_mobile_ui/lib/pages/notes/submenu/self_note_tile.dart