diff --git a/services/frontend/src/pages/CompetitionSession/components/TaskContent/index.tsx b/services/frontend/src/pages/CompetitionSession/components/TaskContent/index.tsx
index 7909578..bd68954 100644
--- a/services/frontend/src/pages/CompetitionSession/components/TaskContent/index.tsx
+++ b/services/frontend/src/pages/CompetitionSession/components/TaskContent/index.tsx
@@ -74,7 +74,11 @@ const TaskContent: React.FC<TaskContentProps> = ({ task }) => {
 const getFileNameFromUrl = (url: string): string => {
   try {
     const parts = url.split('/');
-    return parts[parts.length - 1];
+    const fullFileName = parts[parts.length - 1]
+    const fileName = fullFileName.length > 20 
+    ? fullFileName.substring(0, 20) + '...' 
+    : fullFileName;
+    return fileName;
   } catch (e) {
     return 'Файл';
   }
diff --git a/services/frontend/src/pages/CompetitionSession/modules/TaskSolution/components/ActionButtons/index.tsx b/services/frontend/src/pages/CompetitionSession/modules/TaskSolution/components/ActionButtons/index.tsx
index 03eda32..eb0d280 100644
--- a/services/frontend/src/pages/CompetitionSession/modules/TaskSolution/components/ActionButtons/index.tsx
+++ b/services/frontend/src/pages/CompetitionSession/modules/TaskSolution/components/ActionButtons/index.tsx
@@ -35,7 +35,7 @@ const ActionButtons: React.FC<ActionButtonsProps> = ({
         >
           Задача сдана!
         </Button>
-      ) : hasSubmissionsLeft ? (
+      ) : hasSubmissionsLeft? (
         <Button 
           onClick={onSubmit}
           className="font-hse-sans flex-grow" 
diff --git a/services/frontend/src/pages/CompetitionSession/modules/TaskSolution/index.tsx b/services/frontend/src/pages/CompetitionSession/modules/TaskSolution/index.tsx
index 919da36..befbbbc 100644
--- a/services/frontend/src/pages/CompetitionSession/modules/TaskSolution/index.tsx
+++ b/services/frontend/src/pages/CompetitionSession/modules/TaskSolution/index.tsx
@@ -51,7 +51,7 @@ const TaskSolution: React.FC<TaskSolutionProps> = ({
   const maxAttempts = task.max_attempts || -1;
   const submissionsUsed = solutionHistory.length;
   const submissionsLeft = Math.max(0, maxAttempts - submissionsUsed);
-  const hasSubmissionsLeft = submissionsLeft > 0;
+  const hasSubmissionsLeft = submissionsLeft > 0 || maxAttempts === -1;
 
   useEffect(() => {
     if (solutionHistory.length > 0 && !displayedSolution) {