diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 13ac012..9c5ea7c 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -25,7 +25,8 @@ module.exports = {
   rules: {
     'space-before-function-paren': ['error', 'never'],
     '@typescript-eslint/space-before-function-paren': ['error', 'never'],
-    indent: ['warn', 2, { SwitchCase: 1 }],
+    indent: 'off',
+    '@typescript-eslint/indent': ['warn', 2, {SwitchCase: 1}],
     semi: 'off',
     '@typescript-eslint/semi': ['warn', 'always'],
     'no-unused-vars': 'off',
diff --git a/src/Components/ElementsSidebar/ElementsSidebar.tsx b/src/Components/ElementsSidebar/ElementsSidebar.tsx
index 30f1617..ab3efdd 100644
--- a/src/Components/ElementsSidebar/ElementsSidebar.tsx
+++ b/src/Components/ElementsSidebar/ElementsSidebar.tsx
@@ -110,8 +110,6 @@ export const ElementsSidebar: React.FC<IElementsSidebarProps> = (props: IElement
     );
   };
 
-  const ROW_HEIGHT = 35;
-  const NUMBERS_OF_ROWS = 10;
   return (
     <div className={`fixed flex flex-col bg-slate-100 text-gray-800 transition-all h-full w-64 overflow-y-auto z-20 ${isOpenClasses}`}>
       <div className='bg-slate-100 font-bold sidebar-title'>
diff --git a/src/Components/ElementsSidebar/MouseEventHandlers.ts b/src/Components/ElementsSidebar/MouseEventHandlers.ts
index 1a814d2..5081033 100644
--- a/src/Components/ElementsSidebar/MouseEventHandlers.ts
+++ b/src/Components/ElementsSidebar/MouseEventHandlers.ts
@@ -36,9 +36,8 @@ export function handleLeftClick(
 }
 
 export function removeBorderClasses(target: HTMLButtonElement): void {
-  target.classList.remove('border-t-8');
-  target.classList.remove('border-8');
-  target.classList.remove('border-b-8');
+  const bordersClasses = ['border-t-8', 'border-8', 'border-b-8'];
+  target.classList.remove(...bordersClasses);
 }
 
 export function handleDragLeave(event: React.DragEvent): void {
@@ -54,26 +53,19 @@ export function handleDragOver(
   const target: HTMLButtonElement = event.target as HTMLButtonElement;
   const rect = target.getBoundingClientRect();
   const y = event.clientY - rect.top; // y position within the element.
+  removeBorderClasses(target);
 
   if (target.id === mainContainer.properties.id) {
     target.classList.add('border-8');
-    target.classList.remove('border-t-8');
-    target.classList.remove('border-b-8');
     return;
   }
 
   if (y < 12) {
     target.classList.add('border-t-8');
-    target.classList.remove('border-b-8');
-    target.classList.remove('border-8');
   } else if (y < 24) {
     target.classList.add('border-8');
-    target.classList.remove('border-t-8');
-    target.classList.remove('border-b-8');
   } else {
     target.classList.add('border-b-8');
-    target.classList.remove('border-8');
-    target.classList.remove('border-t-8');
   }
 }