diff --git a/lib/main.dart b/lib/main.dart
index ef8512f..86da098 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,13 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
+import 'package:shopping_assistant_mobile_client/screens/chat.dart';
 import 'package:shopping_assistant_mobile_client/screens/wishlists.dart';
-import 'package:shopping_assistant_mobile_client/screens/cart.dart';
 
 void main() {
   runApp(const MyApp());
 }
 
-class MyApp extends StatelessWidget {
+class MyApp extends StatefulWidget {
   const MyApp({super.key});
 
   static const List<String> _pageNameOptions = <String>[
@@ -25,98 +25,92 @@ class MyApp extends StatelessWidget {
   static const Color _selectedColor = Color.fromRGBO(36, 36, 36, 1);
   static const Color _unselectedColor = Color.fromRGBO(144, 144, 144, 1);
 
+  State<MyApp> createState() => _MyAppState();
+}
+
+class _MyAppState extends State<MyApp> {
+  int _selectedIndex = 0;
+
+  void _onItemTapped(int index) {
+    setState(() {
+      _selectedIndex = index;
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
-      home: CartScreen()
+      theme: ThemeData(
+        useMaterial3: true,
+        appBarTheme: AppBarTheme(),
+        textTheme: TextTheme(
+          bodyMedium: TextStyle(
+            fontSize: 16,
+            fontWeight: FontWeight.w500,
+          ),
+        ),
+      ),
+      home: Scaffold(
+        appBar: AppBar(
+          title: Text(MyApp._pageNameOptions[_selectedIndex]),
+          centerTitle: true,
+          bottom: PreferredSize(
+            preferredSize: const Size.fromHeight(1),
+            child: Container(
+              color: Color.fromRGBO(234, 234, 234, 1),
+              height: 1,
+            ),
+          ),
+        ),
+        body: MyApp._widgetOptions[_selectedIndex],
+        bottomNavigationBar: BottomNavigationBar(
+          items: <BottomNavigationBarItem>[
+            BottomNavigationBarItem(
+              icon: SvgPicture.asset(
+                'assets/icons/wishlists.svg',
+                color: _selectedIndex == 0
+                    ? MyApp._selectedColor
+                    : MyApp._unselectedColor,
+              ),
+              label: 'Wishlists',
+            ),
+            BottomNavigationBarItem(
+              icon: SvgPicture.asset(
+                'assets/icons/start-new-search.svg',
+                color: _selectedIndex == 1
+                    ? MyApp._selectedColor
+                    : MyApp._unselectedColor,
+              ),
+              label: 'New Chat',
+            ),
+            BottomNavigationBarItem(
+              icon: SvgPicture.asset(
+                'assets/icons/settings.svg',
+                color: _selectedIndex == 2
+                    ? MyApp._selectedColor
+                    : MyApp._unselectedColor,
+              ),
+              label: 'Settings',
+            ),
+          ],
+          selectedItemColor: MyApp._selectedColor,
+          unselectedItemColor: MyApp._unselectedColor,
+          selectedFontSize: 14,
+          unselectedFontSize: 14,
+          currentIndex: _selectedIndex,
+          onTap: _onItemTapped,
+        ),
+      ),
     );
   }
-  //State<MyApp> createState() => _MyAppState();
 }
 
-// class _MyAppState extends State<MyApp> {
-//   int _selectedIndex = 0;
-//
-//   void _onItemTapped(int index) {
-//     setState(() {
-//       _selectedIndex = index;
-//     });
-//   }
-//
-//   @override
-//   Widget build(BuildContext context) {
-//     return MaterialApp(
-//       theme: ThemeData(
-//         useMaterial3: true,
-//         appBarTheme: AppBarTheme(),
-//         textTheme: TextTheme(
-//           bodyMedium: TextStyle(
-//             fontSize: 16,
-//             fontWeight: FontWeight.w500,
-//           ),
-//         ),
-//       ),
-//       home: Scaffold(
-//         appBar: AppBar(
-//           title: Text(MyApp._pageNameOptions[_selectedIndex]),
-//           centerTitle: true,
-//           bottom: PreferredSize(
-//             preferredSize: const Size.fromHeight(1),
-//             child: Container(
-//               color: Color.fromRGBO(234, 234, 234, 1),
-//               height: 1,
-//             ),
-//           ),
-//         ),
-//         body: MyApp._widgetOptions[_selectedIndex],
-//         bottomNavigationBar: BottomNavigationBar(
-//           items: <BottomNavigationBarItem>[
-//             BottomNavigationBarItem(
-//               icon: SvgPicture.asset(
-//                 'assets/icons/wishlists.svg',
-//                 color: _selectedIndex == 0
-//                     ? MyApp._selectedColor
-//                     : MyApp._unselectedColor,
-//               ),
-//               label: 'Wishlists',
-//             ),
-//             BottomNavigationBarItem(
-//               icon: SvgPicture.asset(
-//                 'assets/icons/start-new-search.svg',
-//                 color: _selectedIndex == 1
-//                     ? MyApp._selectedColor
-//                     : MyApp._unselectedColor,
-//               ),
-//               label: 'New Chat',
-//             ),
-//             BottomNavigationBarItem(
-//               icon: SvgPicture.asset(
-//                 'assets/icons/settings.svg',
-//                 color: _selectedIndex == 2
-//                     ? MyApp._selectedColor
-//                     : MyApp._unselectedColor,
-//               ),
-//               label: 'Settings',
-//             ),
-//           ],
-//           selectedItemColor: MyApp._selectedColor,
-//           unselectedItemColor: MyApp._unselectedColor,
-//           selectedFontSize: 14,
-//           unselectedFontSize: 14,
-//           currentIndex: _selectedIndex,
-//           onTap: _onItemTapped,
-//         ),
-//       ),
-//     );
-//   }
-// }
-
 
 
 
 
 // Use to seed wishlists for new user
-//final ApiClient client = ApiClient();
+// final ApiClient client = ApiClient();
 //
 // const String startPersonalWishlistMutations = r'''
 //   mutation startPersonalWishlist($dto: WishlistCreateDtoInput!) {
@@ -142,4 +136,4 @@ class MyApp extends StatelessWidget {
 // //       .then((result) => print(jsonEncode(result)));
 // //   sleep(Duration(milliseconds: 100));
 // // }
-//
+//
\ No newline at end of file
diff --git a/lib/screens/cart.dart b/lib/screens/cart.dart
index bc35439..015f790 100644
--- a/lib/screens/cart.dart
+++ b/lib/screens/cart.dart
@@ -5,8 +5,6 @@ import 'package:url_launcher/url_launcher.dart';
 import 'package:shopping_assistant_mobile_client/models/product.dart';
 import 'package:shopping_assistant_mobile_client/network/api_client.dart';
 
-const String defaultUrl = 'https://s3-alpha-sig.figma.com/img/b8d6/7b6f/59839f0f3abfdeed91ca32d3501cbfa3?Expires=1702252800&Signature=aDWc2xO9d01Criwp829ZjhWE1pu~XGezZiM9oNOGkVZOYyGwxfDq5lVOSV0WOEkYdBR83hW7a-I2LY-U5R9evtoKf0BRGY1VVZ0H1wkp5WOHlC196gKr5tLPfseWahP2GWsQNSxfsgxg0cg8l8LamgqS1sUmD1Qt8jWdsqVcwlvTBY8X0q~ScDeCGn1n-7Npj315r4CbVLYMLfZWjpXROcR~Jpx-sqKVaxakw5OWdjegw7YBn~MAY6~yNi~Ylf44oFLkBpzI2aA65Z-TiRMPJ7HoLqJ3id8Eq7NoJ2PKxL88aZ2cOk9ZduRU7jI8FO-PvEBT-Qiwz0tUyEzmbiziDg__&Key-Pair-Id=APKAQ4GOSFWCVNEHN3O4';
-
 
 class CartScreen extends StatefulWidget {
   CartScreen({super.key, required this.wishlistId});
@@ -19,13 +17,6 @@ class CartScreen extends StatefulWidget {
 
 class _CartScreenState extends State<CartScreen> {
   _CartScreenState({required this.wishlistId});
-  // final _products = [
-  //   Product(name : '1', id: "Belkin USB C to VGA + Charge Adapter - USB C to VGA Cable for MacBook", price: 12.57, rating: 4.34, url: 'a', imageUrls: [defaultUrl,'a','b']),
-  //   Product(id : '1', name: "USB C to VGA 2", price: 12.57, rating: 4.5, url: 'a', imageUrls: [defaultUrl,'a','b']),
-  //   Product(id : '1', name: "USB C to VGA 2", price: 12.57, rating: 4.2, url: 'a', imageUrls: [defaultUrl,'a','b']),
-  //   Product(id : '1', name: "USB C to VGA 2", price: 12.57, rating: 4.7, url: 'a', imageUrls: [defaultUrl,'a','b']),
-  //   Product(id : '1', name: "USB C to VGA 2", price: 12.57, rating: 4.8, url: 'a', imageUrls: [defaultUrl,'a','b'])
-  // ];
 
   var client = ApiClient();
 
@@ -93,8 +84,6 @@ class _CartScreenState extends State<CartScreen> {
           appBar: AppBar(
             title: Text("Cart"),
             centerTitle: true,
-            //titleTextStyle: TextStyle(color: Colors.black),
-            //backgroundColor: ,
             leading: IconButton(
               icon: Icon(Icons.arrow_back),
               onPressed: () {
@@ -219,14 +208,13 @@ class CartItem extends StatelessWidget{
                     child: ElevatedButton.icon(
                       onPressed: () => _launchUrl(_product.url),
                       style: ElevatedButton.styleFrom(
-                        backgroundColor: Colors.blue,// Блакитний колір фону кнопки
+                        backgroundColor: Colors.blue,
                         padding: EdgeInsets.symmetric(horizontal: 12, vertical: 6),
                       ),
                       icon: SvgPicture.asset("../assets/icons/amazon.svg", height: 15),
                       label: Text(""),
                     ),
                   )
-
                 ],
               )
           )