diff --git a/src/components/Apps/AppInfo.tsx b/src/components/Apps/AppInfo.tsx
index 6dc8c37..abca186 100644
--- a/src/components/Apps/AppInfo.tsx
+++ b/src/components/Apps/AppInfo.tsx
@@ -1,4 +1,3 @@
-import React, { useEffect, useMemo, useState } from 'react';
 import {
   AppCircle,
   AppCircleContainer,
@@ -172,7 +171,7 @@ export const AppInfo = ({ app, myName }) => {
               }}
             >
               <AppDownloadButtonText>
-                {isSelectedAppPinned
+                {isSelectedAppPinned // TODO translate
                   ? 'Unpin from dashboard'
                   : 'Pin to dashboard'}
               </AppDownloadButtonText>
diff --git a/src/components/Apps/AppInfoSnippet.tsx b/src/components/Apps/AppInfoSnippet.tsx
index 22903d9..ba71164 100644
--- a/src/components/Apps/AppInfoSnippet.tsx
+++ b/src/components/Apps/AppInfoSnippet.tsx
@@ -166,7 +166,7 @@ export const AppInfoSnippet = ({
           sx={{
             backgroundColor: theme.palette.background.paper,
             opacity: isSelectedAppPinned ? 0.6 : 1,
-          }}
+          }} // TODO translate
         >
           <AppDownloadButtonText>
             {' '}
diff --git a/src/components/Apps/AppPublish.tsx b/src/components/Apps/AppPublish.tsx
index 486fd8a..8875c0b 100644
--- a/src/components/Apps/AppPublish.tsx
+++ b/src/components/Apps/AppPublish.tsx
@@ -185,6 +185,7 @@ export const AppPublish = ({ names, categories }) => {
       const fee = await getFee('ARBITRARY');
 
       await show({
+        // TODO translate
         message: 'Would you like to publish this app?',
         publishFee: fee.fee + ' QORT',
       });
diff --git a/src/components/Apps/AppRating.tsx b/src/components/Apps/AppRating.tsx
index 191650d..881cfec 100644
--- a/src/components/Apps/AppRating.tsx
+++ b/src/components/Apps/AppRating.tsx
@@ -106,6 +106,7 @@ export const AppRating = ({ app, myName, ratingCountPosition = 'right' }) => {
       const fee = await getFee('CREATE_POLL');
 
       await show({
+        // TODO translate
         message: `Would you like to rate this app a rating of ${newValue}?. It will create a POLL tx.`,
         publishFee: fee.fee + ' QORT',
       });
diff --git a/src/components/Apps/Apps-styles.tsx b/src/components/Apps/Apps-styles.tsx
index dd10e36..abbbaba 100644
--- a/src/components/Apps/Apps-styles.tsx
+++ b/src/components/Apps/Apps-styles.tsx
@@ -351,7 +351,7 @@ export const PublishQAppChoseFile = styled(ButtonBase)(({ theme }) => ({
   justifyContent: 'center',
   width: '120px',
   '&:hover': {
-    backgroundColor: 'action.hover', // background on hover
+    backgroundColor: 'action.hover',
   },
 }));
 
diff --git a/src/components/Apps/AppsCategoryDesktop.tsx b/src/components/Apps/AppsCategoryDesktop.tsx
index 39f12ee..7fc853a 100644
--- a/src/components/Apps/AppsCategoryDesktop.tsx
+++ b/src/components/Apps/AppsCategoryDesktop.tsx
@@ -16,20 +16,6 @@ import { Spacer } from '../../common/Spacer';
 import { AppInfoSnippet } from './AppInfoSnippet';
 import { Virtuoso } from 'react-virtuoso';
 
-const ScrollerStyled = styled('div')({
-  // Hide scrollbar for WebKit browsers (Chrome, Safari)
-  '::-webkit-scrollbar': {
-    width: '0px',
-    height: '0px',
-  },
-
-  // Hide scrollbar for Firefox
-  scrollbarWidth: 'none',
-
-  // Hide scrollbar for IE and older Edge
-  msOverflowStyle: 'none',
-});
-
 const StyledVirtuosoContainer = styled('div')({
   position: 'relative',
   width: '100%',
@@ -99,7 +85,8 @@ export const AppsCategoryDesktop = ({
   }, [debouncedValue, categoryList]);
 
   const rowRenderer = (index) => {
-    let app = searchedList[index];
+    const app = searchedList[index];
+
     return (
       <AppInfoSnippet
         key={`${app?.service}-${app?.name}`}
@@ -205,9 +192,6 @@ export const AppsCategoryDesktop = ({
               itemContent={rowRenderer}
               atBottomThreshold={50}
               followOutput="smooth"
-              // components={{
-              //   Scroller: ScrollerStyled, // Use the styled scroller component
-              // }}
             />
           </StyledVirtuosoContainer>
         </AppsWidthLimiter>
diff --git a/src/components/Apps/AppsDesktop.tsx b/src/components/Apps/AppsDesktop.tsx
index 80f57b9..d1268fb 100644
--- a/src/components/Apps/AppsDesktop.tsx
+++ b/src/components/Apps/AppsDesktop.tsx
@@ -17,7 +17,6 @@ import { AppsCategoryDesktop } from './AppsCategoryDesktop';
 import { AppsNavBarDesktop } from './AppsNavBarDesktop';
 import { Box, ButtonBase, useTheme } from '@mui/material';
 import { HomeIcon } from '../../assets/Icons/HomeIcon';
-import { MessagingIcon } from '../../assets/Icons/MessagingIcon';
 import { Save } from '../Save/Save';
 import { IconWrapper } from '../Desktop/DesktopFooter';
 import { enabledDevModeAtom } from '../../atoms/global';
@@ -98,8 +97,6 @@ export const AppsDesktop = ({
       setCategories(responseData);
     } catch (error) {
       console.log(error);
-    } finally {
-      // dispatch(setIsLoadingGlobal(false))
     }
   }, []);
 
@@ -135,8 +132,6 @@ export const AppsDesktop = ({
       setAvailableQapps(combine);
     } catch (error) {
       console.log(error);
-    } finally {
-      // dispatch(setIsLoadingGlobal(false))
     }
   }, []);
   useEffect(() => {
@@ -338,13 +333,13 @@ export const AppsDesktop = ({
       <Box
         sx={{
           alignItems: 'center',
+          backgroundColor: theme.palette.background.surface,
+          borderRight: `1px solid ${theme.palette.border.subtle}`,
           display: 'flex',
           flexDirection: 'column',
           gap: '25px',
           height: '100vh',
           width: '60px',
-          backgroundColor: theme.palette.background.surface,
-          borderRight: `1px solid ${theme.palette.border.subtle}`,
         }}
       >
         <ButtonBase
@@ -407,6 +402,7 @@ export const AppsDesktop = ({
             />
           </IconWrapper>
         </ButtonBase>
+
         <Save isDesktop disableWidth myName={myName} />
         {isEnabledDevMode && (
           <ButtonBase
@@ -445,10 +441,10 @@ export const AppsDesktop = ({
         <Box
           sx={{
             display: 'flex',
-            width: '100%',
             flexDirection: 'column',
             height: '100vh',
             overflow: 'auto',
+            width: '100%',
           }}
         >
           <Spacer height="30px" />
@@ -515,6 +511,7 @@ export const AppsDesktop = ({
             }}
           >
             <Spacer height="30px" />
+
             <AppsHomeDesktop
               myName={myName}
               availableQapps={availableQapps}
diff --git a/src/components/Apps/AppsDevMode.tsx b/src/components/Apps/AppsDevMode.tsx
index 1538a92..14a289e 100644
--- a/src/components/Apps/AppsDevMode.tsx
+++ b/src/components/Apps/AppsDevMode.tsx
@@ -310,7 +310,9 @@ export const AppsDevMode = ({
             />
           </IconWrapper>
         </ButtonBase>
+
         <Save isDesktop disableWidth myName={myName} />
+
         <ButtonBase
           onClick={() => {
             setDesktopViewMode('dev');
@@ -342,10 +344,10 @@ export const AppsDevMode = ({
         <Box
           sx={{
             display: 'flex',
-            width: '100%',
             flexDirection: 'column',
             height: '100vh',
             overflow: 'auto',
+            width: '100%',
           }}
         >
           <Spacer height="30px" />
@@ -387,6 +389,7 @@ export const AppsDevMode = ({
             }}
           >
             <Spacer height="30px" />
+
             <AppsDevModeHome
               myName={myName}
               availableQapps={availableQapps}
diff --git a/src/components/Apps/AppsDevModeNavBar.tsx b/src/components/Apps/AppsDevModeNavBar.tsx
index 1bfcf42..5a632cd 100644
--- a/src/components/Apps/AppsDevModeNavBar.tsx
+++ b/src/components/Apps/AppsDevModeNavBar.tsx
@@ -80,13 +80,13 @@ export const AppsDevModeNavBar = () => {
   return (
     <AppsNavBarParent
       sx={{
-        position: 'relative',
+        borderRadius: '0px 30px 30px 0px',
         flexDirection: 'column',
-        width: '59px',
         height: 'unset',
         maxHeight: '70vh',
-        borderRadius: '0px 30px 30px 0px',
         padding: '10px',
+        position: 'relative',
+        width: '59px',
       }}
     >
       <AppsNavBarLeft
diff --git a/src/components/Apps/AppsHomeDesktop.tsx b/src/components/Apps/AppsHomeDesktop.tsx
index 8a96015..21d9d7d 100644
--- a/src/components/Apps/AppsHomeDesktop.tsx
+++ b/src/components/Apps/AppsHomeDesktop.tsx
@@ -51,7 +51,7 @@ export const AppsHomeDesktop = ({
         <AppLibrarySubTitle
           sx={{
             fontSize: '30px',
-          }}
+          }} // TODO translate
         >
           Apps Dashboard
         </AppLibrarySubTitle>
diff --git a/src/components/Apps/AppsLibraryDesktop.tsx b/src/components/Apps/AppsLibraryDesktop.tsx
index 17b9b71..64f1007 100644
--- a/src/components/Apps/AppsLibraryDesktop.tsx
+++ b/src/components/Apps/AppsLibraryDesktop.tsx
@@ -273,7 +273,7 @@ export const AppsLibraryDesktop = ({
             }}
             onClick={() => {
               executeEvent('navigateBack', {});
-            }}
+            }} // TODO translate
           >
             <ReturnIcon />
             <ComposeP>Return to Apps Dashboard</ComposeP>