diff --git a/src/components/ArchiveTableTracker/ArchiveTableTracker.jsx b/src/components/ArchiveTableTracker/ArchiveTableTracker.jsx
index ac500591..71148cfd 100644
--- a/src/components/ArchiveTableTracker/ArchiveTableTracker.jsx
+++ b/src/components/ArchiveTableTracker/ArchiveTableTracker.jsx
@@ -24,9 +24,13 @@ const ArchiveTableTracker = ({ filterCompleteTasks, loader }) => {
                 );
               })
             ) : (
-              <div className="archive__noItem">
-                <p>В данном месяце у вас не было задач</p>
-              </div>
+              <tr>
+                <td>
+                  <div className="archive__noItem">
+                    <p>В данном месяце у вас не было задач</p>
+                  </div>
+                </td>
+              </tr>
             )}
           </>
         )}
diff --git a/src/components/Common/ModalLayout/modalLayout.scss b/src/components/Common/ModalLayout/modalLayout.scss
index 1b314672..b803a061 100644
--- a/src/components/Common/ModalLayout/modalLayout.scss
+++ b/src/components/Common/ModalLayout/modalLayout.scss
@@ -135,7 +135,7 @@
 .edit-column {
   // background: linear-gradient(180deg, #fff 0%, #ebebeb 37.29%);
   .title-project {
-    margin-top: 20px;
+    margin-top: 8px;
   }
   .button-add {
     margin-top: 8px;
diff --git a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
index 299380d9..cd175b11 100644
--- a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
+++ b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
@@ -972,7 +972,7 @@ export const TicketFullScreen = () => {
                   </div>
                   <div className="time">
                     <img src={watch}></img>
-                    <span>Длительность : </span>
+                    <span>Длительность: </span>
                     <p>
                       {correctTimerTime(currentTimerCount.hours)}:
                       {correctTimerTime(currentTimerCount.minute)}:
diff --git a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
index 4850b042..1f0a413e 100644
--- a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
+++ b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
@@ -793,55 +793,49 @@ export const TrackerModal = ({
       {modalType === "edit-column" && (
         <div>
           <div className="title-project">
-            <h4>Введите новое название</h4>
-            <div className="input-container">
-              <input
-                className="name-project"
-                value={columnName}
-                onChange={(e) => dispatch(setColumnName(e.target.value))}
-              />
+            <div>
+              <h4>Название колонки</h4>
+              <div className="input-container">
+                <input
+                  className="name-project"
+                  value={columnName}
+                  onChange={(e) => dispatch(setColumnName(e.target.value))}
+                />
+              </div>
             </div>
-            <h4>Приоритет колонки</h4>
-            <div
-              className={
-                selectColumnPriorityOpen
-                  ? "select-priority select-priority--open"
-                  : "select-priority"
-              }
-              onClick={() =>
-                setSelectColumnPriorityOpen(!selectColumnPriorityOpen)
-              }
-            >
-              <span>{selectColumnPriority}</span>
-              <img src={arrowDown} alt="arrow" />
-              {selectColumnPriorityOpen && (
-                <div className="select-priority__dropDown">
-                  {projectBoard.columns.map((column, index) => {
-                    return (
-                      <span
-                        key={column.id}
-                        onClick={() => {
-                          setSelectColumnPriority(index + 1);
-                          dispatch(setColumnPriority(index + 1));
-                        }}
-                      >
-                        {index + 1}
-                      </span>
-                    );
-                  })}
-                </div>
-              )}
+            <div>
+              <h4>Приоритет колонки</h4>
+              <div
+                className={
+                  selectColumnPriorityOpen
+                    ? "select-priority select-priority--open"
+                    : "select-priority"
+                }
+                onClick={() =>
+                  setSelectColumnPriorityOpen(!selectColumnPriorityOpen)
+                }
+              >
+                <span>{selectColumnPriority}</span>
+                <img src={arrowDown} alt="arrow" />
+                {selectColumnPriorityOpen && (
+                  <div className="select-priority__dropDown">
+                    {projectBoard.columns.map((column, index) => {
+                      return (
+                        <span
+                          key={column.id}
+                          onClick={() => {
+                            setSelectColumnPriority(index + 1);
+                            dispatch(setColumnPriority(index + 1));
+                          }}
+                        >
+                          {index + 1}
+                        </span>
+                      );
+                    })}
+                  </div>
+                )}
+              </div>
             </div>
-            {/*<div className="input-container">*/}
-            {/*  <input*/}
-            {/*    className="name-project"*/}
-            {/*    placeholder="Приоритет колонки"*/}
-            {/*    type="number"*/}
-            {/*    step="1"*/}
-            {/*    value={columnPriority}*/}
-            {/*    onChange={(e) => dispatch(setColumnPriority(e.target.value))}*/}
-            {/*  />*/}
-            {/*</div>*/}
           </div>
           <BaseButton styles={"button-add"} onClick={changeColumnParams}>
             Сохранить
diff --git a/src/components/Modal/Tracker/TrackerModal/trackerModal.scss b/src/components/Modal/Tracker/TrackerModal/trackerModal.scss
index 6dfede96..5d7560ba 100644
--- a/src/components/Modal/Tracker/TrackerModal/trackerModal.scss
+++ b/src/components/Modal/Tracker/TrackerModal/trackerModal.scss
@@ -30,13 +30,12 @@
   display: flex;
   align-items: center;
   flex-direction: column;
-  row-gap: 8px;
-  padding-bottom: 10px;
+  row-gap: 12px;
+  padding-bottom: 15px;
 
   .select-priority {
     background-color: white;
     width: 100%;
-    margin: 12px 0;
     padding: 10px 8px;
     border-radius: 8px;
     font-size: 14px;
diff --git a/src/pages/ProjectTracker/ProjectTracker.js b/src/pages/ProjectTracker/ProjectTracker.js
index 976330fa..323bc54a 100644
--- a/src/pages/ProjectTracker/ProjectTracker.js
+++ b/src/pages/ProjectTracker/ProjectTracker.js
@@ -397,15 +397,8 @@ export const ProjectTracker = () => {
             div.classList.contains("tags__list"))
       )
     ) {
-      setTags({
-        open: false,
-        add: false,
-        edit: false
-      });
-      setTagInfo({
-        description: "",
-        name: ""
-      });
+      setTags({ open: false, add: false, edit: false });
+      setTagInfo({ description: "", name: "" });
       setColor("#aabbcc");
     }
 
@@ -962,20 +955,11 @@ export const ProjectTracker = () => {
                                       src={commentsBoard}
                                       alt="commentsImg"
                                     />
-                                    <span>
-                                      {task.comment_count}{" "}
-                                      {/* {caseOfNum(
-                                        task.comment_count,
-                                        "comments"
-                                      )} */}
-                                    </span>
+                                    <span>{task.comment_count}</span>
                                   </div>
                                   <div className="tasks__board__item__info__more">
                                     <img src={filesBoard} alt="filesImg" />
-                                    <span>
-                                      {task.file_count ? task.file_count : 0}{" "}
-                                      {/* {caseOfNum(0, "files")} */}
-                                    </span>
+                                    <span>{task.file_count}</span>
                                   </div>
                                 </div>
                                 <TrackerSelectColumn