diff --git a/client/src/pages/catalogue/index.ts b/client/src/pages/catalogue/index.ts
index 9b02b552..e150e945 100644
--- a/client/src/pages/catalogue/index.ts
+++ b/client/src/pages/catalogue/index.ts
@@ -1,4 +1,4 @@
-import { CataloguePage } from "./ui/CataloguePage";
+import { CataloguePage } from "./ui/Catalogue.page";
 import { loader } from "./api/loader";
 import { CatalogueLoader } from "./api/loader";
 
diff --git a/client/src/pages/catalogue/ui/Catalogue.page.tsx b/client/src/pages/catalogue/ui/Catalogue.page.tsx
index f2d5fee7..a4ae4cd2 100644
--- a/client/src/pages/catalogue/ui/Catalogue.page.tsx
+++ b/client/src/pages/catalogue/ui/Catalogue.page.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useRef, useState } from "react";
-import styles from "./styles/CataloguePage.module.css";
+import styles from "./styles/Catalogue.page.module.css";
 import { HeaderWidget } from "widgets/header";
 import { FooterWidget } from "widgets/footer";
 import { useLoaderData } from "react-router-dom";
diff --git a/client/src/pages/create-instrument/api/action.ts b/client/src/pages/create-instrument/api/action.ts
index f7ba93c8..6e8153a0 100644
--- a/client/src/pages/create-instrument/api/action.ts
+++ b/client/src/pages/create-instrument/api/action.ts
@@ -1,7 +1,7 @@
 import { ActionFunction } from "react-router-dom";
 import Jwt from "domain/model/jwt";
 import { CreateInstrumentApi } from "generated/api/create-instrument-api";
-import { parseInstrumentDetails } from "shared";
+import { parseInstrumentDetails } from "shared/model";
 
 export interface CreateInstrumentAction {
   errors: string[] | null;
diff --git a/client/src/pages/create-instrument/index.ts b/client/src/pages/create-instrument/index.ts
index 5383f3f1..4132247a 100644
--- a/client/src/pages/create-instrument/index.ts
+++ b/client/src/pages/create-instrument/index.ts
@@ -1,4 +1,4 @@
-import { CreateInstrumentPage } from "./ui/CreateInstrumentPage";
+import { CreateInstrumentPage } from "./ui/CreateInstrument.page";
 
 import { action } from "./api/action";
 
diff --git a/client/src/pages/create-instrument/ui/CreateInstrument.page.tsx b/client/src/pages/create-instrument/ui/CreateInstrument.page.tsx
index ed743f79..55df2858 100644
--- a/client/src/pages/create-instrument/ui/CreateInstrument.page.tsx
+++ b/client/src/pages/create-instrument/ui/CreateInstrument.page.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import styles from "./styles/CreateInstrumentPage.module.css";
+import styles from "./styles/CreateInstrument.page.module.css";
 import { HeaderWidget } from "widgets/header";
 import { FooterWidget } from "widgets/footer";
 import { Form, useActionData, useLoaderData } from "react-router-dom";
diff --git a/client/src/pages/edit-instrument/api/action.ts b/client/src/pages/edit-instrument/api/action.ts
index b793b414..0396a095 100644
--- a/client/src/pages/edit-instrument/api/action.ts
+++ b/client/src/pages/edit-instrument/api/action.ts
@@ -1,7 +1,7 @@
 import { ActionFunction } from "react-router-dom";
 import Jwt from "domain/model/jwt";
-import { parseInstrumentDetails } from "shared";
 import { EditInstrumentApi } from "generated/api/edit-instrument-api";
+import { parseInstrumentDetails } from "shared/model";
 
 export interface EditInstrumentAction {
   errors: string[];
diff --git a/client/src/pages/edit-instrument/index.ts b/client/src/pages/edit-instrument/index.ts
index 5160085e..3f011254 100644
--- a/client/src/pages/edit-instrument/index.ts
+++ b/client/src/pages/edit-instrument/index.ts
@@ -1,4 +1,4 @@
-import { EditInstrumentPage } from "./ui/EditInstrumentPage";
+import { EditInstrumentPage } from "./ui/EditInstrument.page";
 import { action } from "./api/action";
 import { loader } from "./api/loader";
 
diff --git a/client/src/pages/edit-instrument/ui/InstrumentBasicMaterial.field.tsx b/client/src/pages/edit-instrument/ui/InstrumentBasicMaterial.field.tsx
index 2a13891b..8e385396 100644
--- a/client/src/pages/edit-instrument/ui/InstrumentBasicMaterial.field.tsx
+++ b/client/src/pages/edit-instrument/ui/InstrumentBasicMaterial.field.tsx
@@ -1,5 +1,5 @@
 import React, { useRef, useState } from "react";
-import formStyles from "./styles/EditInstrumentPage.module.css";
+import formStyles from "./styles/EditInstrument.page.module.css";
 import styles from "./styles/InstrumentBasicMaterial.field.module.css";
 import { BasicMaterial } from "generated/model";
 
diff --git a/client/src/pages/favorite/index.ts b/client/src/pages/favorite/index.ts
index ea0991e8..cc24af1c 100644
--- a/client/src/pages/favorite/index.ts
+++ b/client/src/pages/favorite/index.ts
@@ -1,4 +1,4 @@
-import { FavoritePage } from "./ui/FavoritePage";
+import { FavoritePage } from "./ui/Favorite.page";
 import { loader, FavoriteLoader } from "./api/loader";
 
 export { FavoritePage, loader };
diff --git a/client/src/pages/home/index.ts b/client/src/pages/home/index.ts
index 07b54c4f..dd520cb1 100644
--- a/client/src/pages/home/index.ts
+++ b/client/src/pages/home/index.ts
@@ -1,3 +1,3 @@
-import { HomePage } from "./ui/HomePage";
+import { HomePage } from "./ui/Home.page";
 
 export { HomePage };
diff --git a/client/src/pages/home/ui/Home.page.tsx b/client/src/pages/home/ui/Home.page.tsx
index 82118f8d..39d66f11 100644
--- a/client/src/pages/home/ui/Home.page.tsx
+++ b/client/src/pages/home/ui/Home.page.tsx
@@ -1,5 +1,6 @@
 import React from "react";
 import styles from "./styles/Home.page.module.css";
+import "react-slideshow-image/dist/styles.css";
 import { HeaderWidget } from "widgets/header";
 import { FooterWidget } from "widgets/footer";
 import { Slide } from "react-slideshow-image";
@@ -80,7 +81,7 @@ export function HomePage() {
           responsive={trendingInstrumentsResponsiveSettings}
         >
           {images.map((img) => (
-            <div key={img.image} className={styles.eachSlide}>
+            <div key={img.image} className={styles.each_slide}>
               <img
                 src={img.image}
                 alt={img.caption}
diff --git a/client/src/pages/home/ui/styles/Home.page.module.css b/client/src/pages/home/ui/styles/Home.page.module.css
index 50b1fe33..f5226322 100644
--- a/client/src/pages/home/ui/styles/Home.page.module.css
+++ b/client/src/pages/home/ui/styles/Home.page.module.css
@@ -1,5 +1,4 @@
-@import "HomePage.queries.css";
-@import "react-slideshow-image/dist/styles.css";
+@import "Home.page.queries.css";
 
 .home {
   display: flex;
@@ -54,6 +53,6 @@
   margin: 0 15px 15px 15px;
 }
 
-.each-slide {
+.each_slide {
   margin: 0 15px;
 }
diff --git a/client/src/pages/home/ui/styles/Home.page.queries.css b/client/src/pages/home/ui/styles/Home.page.queries.css
index 82594af7..a7f7f547 100644
--- a/client/src/pages/home/ui/styles/Home.page.queries.css
+++ b/client/src/pages/home/ui/styles/Home.page.queries.css
@@ -1,5 +1,5 @@
 @media (max-width: 570px) {
-  #home-search-bar-form {
+  .home {
     display: flex;
     flex-direction: column;
     justify-content: center;
@@ -18,7 +18,7 @@
     }
   }
 
-  #home-reasons-choose {
+  .reasons {
     flex-direction: column;
 
     div {
@@ -29,7 +29,7 @@
     }
   }
 
-  #trending-instruments {
+  .trends {
     margin: 0 1.5em 1.5em 1.5em !important;
   }
 }
diff --git a/client/src/pages/instrument/index.ts b/client/src/pages/instrument/index.ts
index 08bec2f5..8bfc4eb5 100644
--- a/client/src/pages/instrument/index.ts
+++ b/client/src/pages/instrument/index.ts
@@ -1,4 +1,4 @@
-import { InstrumentPage } from "./ui/InstrumentPage";
+import { InstrumentPage } from "./ui/Instrument.page";
 import { loader } from "./api/loader";
 
 export { InstrumentPage, loader };
diff --git a/client/src/pages/login/index.ts b/client/src/pages/login/index.ts
index 55b1a7b7..d846bbff 100644
--- a/client/src/pages/login/index.ts
+++ b/client/src/pages/login/index.ts
@@ -1,4 +1,4 @@
-import { LoginPage } from "./ui/LoginPage";
+import { LoginPage } from "./ui/Login.page";
 import { action } from "./api/action";
 
 export { LoginPage, action };
diff --git a/client/src/pages/not-found/index.ts b/client/src/pages/not-found/index.ts
index ee204009..2b6dfa69 100644
--- a/client/src/pages/not-found/index.ts
+++ b/client/src/pages/not-found/index.ts
@@ -1,3 +1,3 @@
-import { NotFoundPage } from "./ui/NotFoundPage";
+import { NotFoundPage } from "./ui/NotFound.page";
 
 export { NotFoundPage };
diff --git a/client/src/pages/not-found/ui/NotFound.page.tsx b/client/src/pages/not-found/ui/NotFound.page.tsx
index 0881685c..0751c072 100644
--- a/client/src/pages/not-found/ui/NotFound.page.tsx
+++ b/client/src/pages/not-found/ui/NotFound.page.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import styles from "./styles/NotFoundPage.module.css";
+import styles from "./styles/NotFound.page.module.css";
 import { HeaderWidget } from "widgets/header";
 
 export function NotFoundPage() {
diff --git a/client/src/pages/profile/index.ts b/client/src/pages/profile/index.ts
index 95bab595..36d73635 100644
--- a/client/src/pages/profile/index.ts
+++ b/client/src/pages/profile/index.ts
@@ -1,4 +1,4 @@
-import { UserProfilePage } from "./ui/UserProfilePage";
+import { UserProfilePage } from "./ui/UserProfile.page";
 import { loader } from "./api/loader";
 
 export { UserProfilePage, loader };
diff --git a/client/src/pages/registration/index.ts b/client/src/pages/registration/index.ts
index d6e334a0..6b2bddf8 100644
--- a/client/src/pages/registration/index.ts
+++ b/client/src/pages/registration/index.ts
@@ -1,4 +1,4 @@
-import { RegistrationPage } from "./ui/RegistrationPage";
+import { RegistrationPage } from "./ui/Registration.page";
 
 import { action } from "./api/action";
 
diff --git a/client/src/shared/instrument-card-actions/index.ts b/client/src/shared/instrument-card-actions/index.ts
index acdd24c1..0310cac9 100644
--- a/client/src/shared/instrument-card-actions/index.ts
+++ b/client/src/shared/instrument-card-actions/index.ts
@@ -1,7 +1,7 @@
-import { AddOrRemoveFavoriteButton } from "./ui/AddOrRemoveFavoriteButton";
-import { EditInstrumentButton } from "./ui/EditInstrumentButton";
-import { RemoveInstrumentButton } from "./ui/RemoveInstrumentButton";
-import { GoToInstrumentButton } from "./ui/GoToInstrumentButton";
+import { AddOrRemoveFavoriteButton } from "./ui/AddOrRemoveFavorite.button";
+import { EditInstrumentButton } from "./ui/EditInstrument.button";
+import { RemoveInstrumentButton } from "./ui/RemoveInstrument.button";
+import { GoToInstrumentButton } from "./ui/GoToInstrument.button";
 
 export {
   AddOrRemoveFavoriteButton,
diff --git a/client/src/shared/instrument-card/ui/styles/InstrumentCard.module.css b/client/src/shared/instrument-card/ui/styles/InstrumentCard.module.css
index 525cfe8e..a6782cc5 100644
--- a/client/src/shared/instrument-card/ui/styles/InstrumentCard.module.css
+++ b/client/src/shared/instrument-card/ui/styles/InstrumentCard.module.css
@@ -1,5 +1,4 @@
 .instrument_card {
   display: flex;
   flex-direction: column;
-  background-color: darkslateblue;
 }
diff --git a/client/src/widgets/catalogue-filter/index.ts b/client/src/widgets/catalogue-filter/index.ts
index 70d2a4bb..2c2e2588 100644
--- a/client/src/widgets/catalogue-filter/index.ts
+++ b/client/src/widgets/catalogue-filter/index.ts
@@ -1,4 +1,4 @@
-import { CatalogueFilterWidget } from "./ui/CatalogueFilterWidget";
+import { CatalogueFilterWidget } from "./ui/CatalogueFilter.widget";
 
 import type { Filters } from "./model/filter";
 
diff --git a/client/src/widgets/catalogue-filter/ui/CatalogueFilter.widget.tsx b/client/src/widgets/catalogue-filter/ui/CatalogueFilter.widget.tsx
index 106ee7ac..b2c5ab0d 100644
--- a/client/src/widgets/catalogue-filter/ui/CatalogueFilter.widget.tsx
+++ b/client/src/widgets/catalogue-filter/ui/CatalogueFilter.widget.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react";
-import "./styles/CreateInstrumentCardButton.css";
+import "./styles/CreateInstrumentCard.button.module.css";
 import { Filters } from "widgets/catalogue-filter";
 import { Role } from "domain/model/role";
 import Jwt from "domain/model/jwt";
diff --git a/client/src/widgets/catalogue-navbar/index.ts b/client/src/widgets/catalogue-navbar/index.ts
index 0ac20423..29fd445c 100644
--- a/client/src/widgets/catalogue-navbar/index.ts
+++ b/client/src/widgets/catalogue-navbar/index.ts
@@ -1,3 +1,3 @@
-import { NavigationBarWidget } from "./ui/NavigationBarWidget";
+import { NavigationBarWidget } from "./ui/NavigationBar.widget";
 
 export { NavigationBarWidget };
diff --git a/client/src/widgets/catalogue-serp/index.ts b/client/src/widgets/catalogue-serp/index.ts
index d7de6dcc..9f2eeb61 100644
--- a/client/src/widgets/catalogue-serp/index.ts
+++ b/client/src/widgets/catalogue-serp/index.ts
@@ -1,3 +1,3 @@
-import { CatalogueSerpWidget } from "./ui/CatalogueSerpWidget";
+import { CatalogueSerpWidget } from "./ui/CatalogueSerp.widget";
 
 export { CatalogueSerpWidget };
diff --git a/client/src/widgets/footer/index.ts b/client/src/widgets/footer/index.ts
index 5ddfa65f..709f386e 100644
--- a/client/src/widgets/footer/index.ts
+++ b/client/src/widgets/footer/index.ts
@@ -1 +1 @@
-export { FooterWidget } from "./ui/FooterWidget";
+export { FooterWidget } from "./ui/Footer.widget";
diff --git a/client/src/widgets/header/index.ts b/client/src/widgets/header/index.ts
index 16f3cb98..68168e94 100644
--- a/client/src/widgets/header/index.ts
+++ b/client/src/widgets/header/index.ts
@@ -1 +1 @@
-export { HeaderWidget } from "./ui/HeaderWidget";
+export { HeaderWidget } from "./ui/Header.widget";
diff --git a/client/src/widgets/modal/index.ts b/client/src/widgets/modal/index.ts
index b79c3d13..6b4e7a4a 100644
--- a/client/src/widgets/modal/index.ts
+++ b/client/src/widgets/modal/index.ts
@@ -1,3 +1,3 @@
-import { ModalWidget } from "./ui/ModalWidget";
+import { ModalWidget } from "./ui/Modal.widget";
 
 export { ModalWidget };