diff --git a/src/app/modals/issue-book-modal/issue-book-modal.page.ts b/src/app/modals/issue-book-modal/issue-book-modal.page.ts
index 5e80ed3..8dfc20d 100644
--- a/src/app/modals/issue-book-modal/issue-book-modal.page.ts
+++ b/src/app/modals/issue-book-modal/issue-book-modal.page.ts
@@ -22,7 +22,7 @@ export class IssueBookModalPage {
   }
 
   protected user: readerUser | undefined = undefined;
-  public userId = 0;
+  public userId: number | null = null;
   public userFio = '';
   public date = '';
 
@@ -34,7 +34,7 @@ export class IssueBookModalPage {
       this.userId = user.id;
       this.userFio = user.fio;
     } else {
-      user = undefined;
+      this.user = undefined;
     }
   }
 
@@ -67,7 +67,7 @@ export class IssueBookModalPage {
       date: _date.toString(),
       dateTo: this.date,
     };
-    this.storage.addBookIssued(issue).then((r) => {
+    this.storage.addBookIssued(issue).then(() => {
       this.modal?.dismiss(null, 'confirm');
     });
   }
diff --git a/src/app/RentPage/rent-routing.module.ts b/src/app/tabs/RentPage/rent-routing.module.ts
similarity index 100%
rename from src/app/RentPage/rent-routing.module.ts
rename to src/app/tabs/RentPage/rent-routing.module.ts
diff --git a/src/app/RentPage/rent.module.ts b/src/app/tabs/RentPage/rent.module.ts
similarity index 86%
rename from src/app/RentPage/rent.module.ts
rename to src/app/tabs/RentPage/rent.module.ts
index 33e08e6..5b0f11e 100644
--- a/src/app/RentPage/rent.module.ts
+++ b/src/app/tabs/RentPage/rent.module.ts
@@ -5,7 +5,7 @@ import { FormsModule } from '@angular/forms';
 import { RentPage } from './rent.page';
 
 import { RentPageRoutingModule } from './rent-routing.module';
-import { BookPageModule } from '../modals/book-page/book-page.module';
+import { BookPageModule } from '../../modals/book-page/book-page.module';
 
 @NgModule({
   imports: [
diff --git a/src/app/RentPage/rent.page.html b/src/app/tabs/RentPage/rent.page.html
similarity index 100%
rename from src/app/RentPage/rent.page.html
rename to src/app/tabs/RentPage/rent.page.html
diff --git a/src/app/RentPage/rent.page.scss b/src/app/tabs/RentPage/rent.page.scss
similarity index 100%
rename from src/app/RentPage/rent.page.scss
rename to src/app/tabs/RentPage/rent.page.scss
diff --git a/src/app/RentPage/rent.page.spec.ts b/src/app/tabs/RentPage/rent.page.spec.ts
similarity index 100%
rename from src/app/RentPage/rent.page.spec.ts
rename to src/app/tabs/RentPage/rent.page.spec.ts
diff --git a/src/app/RentPage/rent.page.ts b/src/app/tabs/RentPage/rent.page.ts
similarity index 91%
rename from src/app/RentPage/rent.page.ts
rename to src/app/tabs/RentPage/rent.page.ts
index b62ec29..940be37 100644
--- a/src/app/RentPage/rent.page.ts
+++ b/src/app/tabs/RentPage/rent.page.ts
@@ -3,8 +3,8 @@ import {
   bookIssued,
   readerUser,
   StorageService,
-} from '../services/storage/storage.service';
-import { Book, GoogleBookApiService } from '../api/google-book-api.service';
+} from '../../services/storage/storage.service';
+import { Book, GoogleBookApiService } from '../../api/google-book-api.service';
 
 interface issue {
   issue: bookIssued;
diff --git a/src/app/SearchPage/search-routing.module.ts b/src/app/tabs/SearchPage/search-routing.module.ts
similarity index 100%
rename from src/app/SearchPage/search-routing.module.ts
rename to src/app/tabs/SearchPage/search-routing.module.ts
diff --git a/src/app/SearchPage/search.module.ts b/src/app/tabs/SearchPage/search.module.ts
similarity index 86%
rename from src/app/SearchPage/search.module.ts
rename to src/app/tabs/SearchPage/search.module.ts
index b9f8186..b678a2d 100644
--- a/src/app/SearchPage/search.module.ts
+++ b/src/app/tabs/SearchPage/search.module.ts
@@ -5,7 +5,7 @@ import { FormsModule } from '@angular/forms';
 import { SearchPage } from './search.page';
 
 import { SearchPageRoutingModule } from './search-routing.module';
-import { BookPageModule } from '../modals/book-page/book-page.module';
+import { BookPageModule } from '../../modals/book-page/book-page.module';
 
 @NgModule({
   imports: [
diff --git a/src/app/SearchPage/search.page.html b/src/app/tabs/SearchPage/search.page.html
similarity index 100%
rename from src/app/SearchPage/search.page.html
rename to src/app/tabs/SearchPage/search.page.html
diff --git a/src/app/SearchPage/search.page.scss b/src/app/tabs/SearchPage/search.page.scss
similarity index 100%
rename from src/app/SearchPage/search.page.scss
rename to src/app/tabs/SearchPage/search.page.scss
diff --git a/src/app/SearchPage/search.page.spec.ts b/src/app/tabs/SearchPage/search.page.spec.ts
similarity index 100%
rename from src/app/SearchPage/search.page.spec.ts
rename to src/app/tabs/SearchPage/search.page.spec.ts
diff --git a/src/app/SearchPage/search.page.ts b/src/app/tabs/SearchPage/search.page.ts
similarity index 90%
rename from src/app/SearchPage/search.page.ts
rename to src/app/tabs/SearchPage/search.page.ts
index f28b812..8481402 100644
--- a/src/app/SearchPage/search.page.ts
+++ b/src/app/tabs/SearchPage/search.page.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { Subject, takeUntil } from 'rxjs';
-import { Book, GoogleBookApiService } from '../api/google-book-api.service';
+import { Book, GoogleBookApiService } from '../../api/google-book-api.service';
 
 @Component({
   selector: 'app-search-page',
diff --git a/src/app/UsersPage/users-routing.module.ts b/src/app/tabs/UsersPage/users-routing.module.ts
similarity index 100%
rename from src/app/UsersPage/users-routing.module.ts
rename to src/app/tabs/UsersPage/users-routing.module.ts
diff --git a/src/app/UsersPage/users.module.ts b/src/app/tabs/UsersPage/users.module.ts
similarity index 81%
rename from src/app/UsersPage/users.module.ts
rename to src/app/tabs/UsersPage/users.module.ts
index f5c02d7..971b1eb 100644
--- a/src/app/UsersPage/users.module.ts
+++ b/src/app/tabs/UsersPage/users.module.ts
@@ -5,7 +5,7 @@ import { FormsModule } from '@angular/forms';
 import { UsersPage } from './users.page';
 
 import { UsersPageRoutingModule } from './users-routing.module';
-import { NewUserModalPageModule } from '../modals/new-user/new-user-modal.module';
+import { NewUserModalPageModule } from '../../modals/new-user/new-user-modal.module';
 
 @NgModule({
   imports: [
@@ -14,6 +14,7 @@ import { NewUserModalPageModule } from '../modals/new-user/new-user-modal.module
     FormsModule,
     UsersPageRoutingModule,
     NewUserModalPageModule,
+    NewUserModalPageModule,
   ],
   declarations: [UsersPage],
 })
diff --git a/src/app/UsersPage/users.page.html b/src/app/tabs/UsersPage/users.page.html
similarity index 100%
rename from src/app/UsersPage/users.page.html
rename to src/app/tabs/UsersPage/users.page.html
diff --git a/src/app/UsersPage/users.page.scss b/src/app/tabs/UsersPage/users.page.scss
similarity index 100%
rename from src/app/UsersPage/users.page.scss
rename to src/app/tabs/UsersPage/users.page.scss
diff --git a/src/app/UsersPage/users.page.spec.ts b/src/app/tabs/UsersPage/users.page.spec.ts
similarity index 100%
rename from src/app/UsersPage/users.page.spec.ts
rename to src/app/tabs/UsersPage/users.page.spec.ts
diff --git a/src/app/UsersPage/users.page.ts b/src/app/tabs/UsersPage/users.page.ts
similarity index 93%
rename from src/app/UsersPage/users.page.ts
rename to src/app/tabs/UsersPage/users.page.ts
index 1574cd0..c3698ed 100644
--- a/src/app/UsersPage/users.page.ts
+++ b/src/app/tabs/UsersPage/users.page.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import {
   readerUser,
   StorageService,
-} from '../services/storage/storage.service';
+} from '../../services/storage/storage.service';
 
 @Component({
   selector: 'app-users-page',