diff --git a/src/apps/api/serializers/competitions.py b/src/apps/api/serializers/competitions.py
index 9b622b3dc..41cd51341 100644
--- a/src/apps/api/serializers/competitions.py
+++ b/src/apps/api/serializers/competitions.py
@@ -254,7 +254,10 @@ class Meta:
             'registration_auto_approve',
             'queue',
             'enable_detailed_results',
+            'show_detailed_results_in_submission_panel',
+            'show_detailed_results_in_leaderboard',
             'auto_run_submissions',
+            'can_participants_make_submissions_public',
             'make_programs_available',
             'make_input_data_available',
             'docker_image',
@@ -373,7 +376,10 @@ class Meta:
             'submission_count',
             'queue',
             'enable_detailed_results',
+            'show_detailed_results_in_submission_panel',
+            'show_detailed_results_in_leaderboard',
             'auto_run_submissions',
+            'can_participants_make_submissions_public',
             'make_programs_available',
             'make_input_data_available',
             'docker_image',
diff --git a/src/apps/api/serializers/submissions.py b/src/apps/api/serializers/submissions.py
index 33fe9241e..05191e8e3 100644
--- a/src/apps/api/serializers/submissions.py
+++ b/src/apps/api/serializers/submissions.py
@@ -42,6 +42,7 @@ class SubmissionSerializer(serializers.ModelSerializer):
     task = TaskSerializer()
     created_when = serializers.DateTimeField(format="%Y-%m-%d %H:%M")
     auto_run = serializers.SerializerMethodField(read_only=True)
+    can_make_submissions_public = serializers.SerializerMethodField(read_only=True)
 
     class Meta:
         model = Submission
@@ -67,7 +68,8 @@ class Meta:
             'leaderboard',
             'on_leaderboard',
             'task',
-            'auto_run'
+            'auto_run',
+            'can_make_submissions_public',
         )
         read_only_fields = (
             'pk',
@@ -85,6 +87,10 @@ def get_auto_run(self, instance):
         # returns this submission's competition auto_run_submissions Flag
         return instance.phase.competition.auto_run_submissions
 
+    def get_can_make_submissions_public(self, instance):
+        # returns this submission's competition can_participants_make_submissions_public Flag
+        return instance.phase.competition.can_participants_make_submissions_public
+
 
 class SubmissionLeaderBoardSerializer(serializers.ModelSerializer):
     scores = SubmissionScoreSerializer(many=True)
diff --git a/src/apps/api/views/submissions.py b/src/apps/api/views/submissions.py
index d0c0defb7..fccaeefd4 100644
--- a/src/apps/api/views/submissions.py
+++ b/src/apps/api/views/submissions.py
@@ -352,15 +352,15 @@ def get_detail_result(self, request, pk):
                 )
         else:
             return Response({
-                "error_msg": "Visualizations are disabled"},
+                "error_msg": "Detailed results are disable for this competition!"},
                 status=status.HTTP_404_NOT_FOUND
             )
 
     @action(detail=True, methods=('GET',))
     def toggle_public(self, request, pk):
         submission = super().get_object()
-        if not self.has_admin_permission(request.user, submission):
-            raise PermissionDenied(f'You do not have permission to publish this submissions')
+        if not submission.phase.competition.can_participants_make_submissions_public:
+            raise PermissionDenied("You do not have permission to make this submissions public/private")
         is_public = not submission.is_public
         submission.data.is_public = is_public
         submission.data.save(send=False)
diff --git a/src/apps/competitions/migrations/0047_competition_can_participants_make_submissions_public.py b/src/apps/competitions/migrations/0047_competition_can_participants_make_submissions_public.py
new file mode 100644
index 000000000..2b750fa02
--- /dev/null
+++ b/src/apps/competitions/migrations/0047_competition_can_participants_make_submissions_public.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.17 on 2024-03-28 13:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('competitions', '0046_merge_20240222_1916'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='competition',
+            name='can_participants_make_submissions_public',
+            field=models.BooleanField(default=True),
+        ),
+    ]
diff --git a/src/apps/competitions/migrations/0048_auto_20240401_1646.py b/src/apps/competitions/migrations/0048_auto_20240401_1646.py
new file mode 100644
index 000000000..3ed2ad446
--- /dev/null
+++ b/src/apps/competitions/migrations/0048_auto_20240401_1646.py
@@ -0,0 +1,23 @@
+# Generated by Django 2.2.17 on 2024-04-01 16:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('competitions', '0047_competition_can_participants_make_submissions_public'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='competition',
+            name='show_detailed_results_in_leaderboard',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AddField(
+            model_name='competition',
+            name='show_detailed_results_in_submission_panel',
+            field=models.BooleanField(default=True),
+        ),
+    ]
diff --git a/src/apps/competitions/models.py b/src/apps/competitions/models.py
index 03d8b65fc..777dbb86a 100644
--- a/src/apps/competitions/models.py
+++ b/src/apps/competitions/models.py
@@ -49,6 +49,10 @@ class Competition(ChaHubSaveMixin, models.Model):
     description = models.TextField(null=True, blank=True)
     docker_image = models.CharField(max_length=128, default="codalab/codalab-legacy:py37")
     enable_detailed_results = models.BooleanField(default=False)
+    # If true, show detailed results in submission panel
+    show_detailed_results_in_submission_panel = models.BooleanField(default=True)
+    # If true, show detailed results in leaderboard
+    show_detailed_results_in_leaderboard = models.BooleanField(default=True)
     make_programs_available = models.BooleanField(default=False)
     make_input_data_available = models.BooleanField(default=False)
 
@@ -69,6 +73,9 @@ class Competition(ChaHubSaveMixin, models.Model):
     # if false, submissions run will be intiiated by organizer
     auto_run_submissions = models.BooleanField(default=True)
 
+    # If true, participants see the make their submissions public
+    can_participants_make_submissions_public = models.BooleanField(default=True)
+
     def __str__(self):
         return f"competition-{self.title}-{self.pk}-{self.competition_type}"
 
diff --git a/src/apps/competitions/unpackers/v1.py b/src/apps/competitions/unpackers/v1.py
index 91496ddca..dc476a5c2 100644
--- a/src/apps/competitions/unpackers/v1.py
+++ b/src/apps/competitions/unpackers/v1.py
@@ -23,6 +23,8 @@ def __init__(self, *args, **kwargs):
             "description": self.competition_yaml.get("description", ""),
             "docker_image": docker_image,
             "enable_detailed_results": self.competition_yaml.get('enable_detailed_results', False),
+            "show_detailed_results_in_submission_panel": self.competition_yaml.get('show_detailed_results_in_submission_panel', True),
+            "show_detailed_results_in_leaderboard": self.competition_yaml.get('show_detailed_results_in_leaderboard', True),
             "auto_run_submissions": self.competition_yaml.get('auto_run_submissions', True),
             "make_programs_available": self.competition_yaml.get('make_programs_available', False),
             "make_input_data_available": self.competition_yaml.get('make_input_data_available', False),
diff --git a/src/apps/competitions/unpackers/v2.py b/src/apps/competitions/unpackers/v2.py
index 8de2a42ad..b825e9ee2 100644
--- a/src/apps/competitions/unpackers/v2.py
+++ b/src/apps/competitions/unpackers/v2.py
@@ -14,7 +14,10 @@ def __init__(self, *args, **kwargs):
             "registration_auto_approve": self.competition_yaml.get('registration_auto_approve', False),
             "docker_image": self.competition_yaml.get('docker_image', 'codalab/codalab-legacy:py37'),
             "enable_detailed_results": self.competition_yaml.get('enable_detailed_results', False),
+            "show_detailed_results_in_submission_panel": self.competition_yaml.get('show_detailed_results_in_submission_panel', True),
+            "show_detailed_results_in_leaderboard": self.competition_yaml.get('show_detailed_results_in_leaderboard', True),
             "auto_run_submissions": self.competition_yaml.get('auto_run_submissions', True),
+            "can_participants_make_submissions_public": self.competition_yaml.get('can_participants_make_submissions_public', True),
             "make_programs_available": self.competition_yaml.get('make_programs_available', False),
             "make_input_data_available": self.competition_yaml.get('make_input_data_available', False),
             "description": self.competition_yaml.get("description", ""),
diff --git a/src/static/riot/competitions/detail/leaderboards.tag b/src/static/riot/competitions/detail/leaderboards.tag
index 0617a38ea..2f09f26f5 100644
--- a/src/static/riot/competitions/detail/leaderboards.tag
+++ b/src/static/riot/competitions/detail/leaderboards.tag
@@ -78,6 +78,7 @@
         self.phase_id = null
         self.competition_id = null
         self.enable_detailed_results = false
+        self.show_detailed_results_in_leaderboard = false
 
        
         self.bold_class = function(column, submission){
@@ -168,7 +169,7 @@
                             self.columns.push(column)
                         }
                         // -1 id is used for fact sheet answers
-                        if(self.enable_detailed_results & task.id != -1){
+                        if(self.enable_detailed_results & self.show_detailed_results_in_leaderboard & task.id != -1){
                             self.columns.push({
                               task_id: task.id,
                               title: "Detailed Results"
@@ -200,6 +201,7 @@
             self.competition_id = competition.id
             self.opts.is_admin ? self.show_download = "visible": self.show_download = "hidden"
             self.enable_detailed_results = competition.enable_detailed_results
+            self.show_detailed_results_in_leaderboard = competition.show_detailed_results_in_leaderboard
             
         })
 
diff --git a/src/static/riot/competitions/detail/submission_manager.tag b/src/static/riot/competitions/detail/submission_manager.tag
index 5cfa0c7f5..f99b70046 100644
--- a/src/static/riot/competitions/detail/submission_manager.tag
+++ b/src/static/riot/competitions/detail/submission_manager.tag
@@ -64,6 +64,7 @@
             <th>Date</th>
             <th>Status</th>
             <th>Score</th>
+            <th if="{ opts.competition.enable_detailed_results && opts.competition.show_detailed_results_in_submission_panel}">Detailed Results</th>
             <th class="center aligned {admin-action-column: opts.admin, action-column: !opts.admin}">Actions</th>
         </tr>
         </thead>
@@ -99,6 +100,11 @@
                 </sup>
             </td>
             <td>{get_score(submission)}</td>
+            <td if="{ opts.competition.enable_detailed_results && opts.competition.show_detailed_results_in_submission_panel }">
+                <a if="{submission.status === 'Finished'}" href="detailed_results/{submission.id}" target="_blank" class="eye-icon-link">
+                    <i class="icon grey eye eye-icon"></i>
+                </a>
+            </td>
             <td class="center aligned">
                 <virtual if="{ opts.admin }">
                     <!-- run/rerun submission -->
@@ -138,14 +144,14 @@
                     <i class="icon green check"></i>
                 </span>
                 <!--  Make Public  -->
-                <span if="{!submission.is_public && submission.status === 'Finished'}"
+                <span if="{!submission.is_public && submission.status === 'Finished' && submission.can_make_submissions_public}"
                       data-tooltip="Make Public"
                       data-inverted=""
                       onclick="{toggle_submission_is_public.bind(this, submission)}">
                     <i class="icon share teal alternate"></i>
                 </span>
                 <!--  Make Private  -->
-                <span if="{!!submission.is_public && submission.status === 'Finished'}"
+                <span if="{!!submission.is_public && submission.status === 'Finished' && submission.can_make_submissions_public}"
                       data-tooltip="Make Private"
                       data-inverted=""
                       onclick="{toggle_submission_is_public.bind(this, submission)}">
@@ -393,7 +399,6 @@
 
         self.delete_selected_submissions = function () {
             if (confirm(`Are you sure you want to delete the selected submissions?`)) {
-                console.log()
                 CODALAB.api.delete_many_submissions(self.checked_submissions)
                     .done(function (response) {
                         toastr.success('Submissions deleted')
@@ -437,7 +442,7 @@
                         self.update_submissions()
                     })
                     .fail(resp => {
-                        toastr.error('Error updating submission')
+                        toastr.error(resp.responseJSON.detail)
                     })
             }
         }
diff --git a/src/static/riot/competitions/editor/_competition_details.tag b/src/static/riot/competitions/editor/_competition_details.tag
index c068f9810..4e60bbff1 100644
--- a/src/static/riot/competitions/editor/_competition_details.tag
+++ b/src/static/riot/competitions/editor/_competition_details.tag
@@ -1,10 +1,13 @@
 <competition-details>
     <div class="ui form">
+
+        <!--  Title  -->
         <div class="field required">
             <label>Title</label>
             <input type="text" ref="title" onchange="{form_updated}">
         </div>
 
+        <!--  Logo  -->
         <div class="field required">
             <label>Logo</label>
             <!-- This is the SINGLE FILE with NO OTHER OPTIONS example -->
@@ -22,10 +25,56 @@
                 <input value="{ logo_file_name }" readonly onclick="document.getElementById('form_file_logo').click()">
             </div>
         </div>
+
+        <!--  Description  -->
         <div class="field smaller-mde">
             <label>Description</label>
             <textarea class="markdown-editor" ref="comp_description" name="description" onchange="{form_updated}"></textarea>
         </div>
+
+        <!--  Queue  -->
+        <div class="field">
+            <label>Queue</label>
+            <select class="ui fluid search selection dropdown" ref="queue"></select>
+        </div>
+
+        <!--  Docker Image  -->
+        <div class="field required">
+            <label>Competition Docker Image</label>
+            <input type="text" ref="docker_image" placeholder="Example: codalab/codalab-legacy:py37" onchange="{form_updated}">
+        </div>
+
+        <!--  Type  -->
+        <div class="field">
+            <label>Competition Type</label>
+            <div ref="competition_type" class="ui selection dropdown">
+                <input type="hidden" name="competition_type" value="{ data.competition_type || 'competition' }" onchange="{form_updated}">
+                <div class="text">Competition</div>
+                <i class="dropdown icon"></i>
+                <div class="menu">
+                    <div class="item" data-value="competition">Competition</div>
+                    <div class="item" data-value="benchmark">Benchmark</div>
+                </div>
+            </div>
+        </div>
+
+        <!--  Reward  -->
+        <div class="field">
+            <label>Competition Reward</label>
+            <input type="text" ref="reward" placeholder="Example: $1000 for the top participant" onchange="{form_updated}">
+        </div>
+        <!--  Contact Email  -->
+        <div class="field">
+            <label>Organizer Contact Email</label>
+            <input type="email" ref="contact_email" placeholder="Example: email@example.com" onchange="{form_updated}">
+        </div>
+        <!--  Report  -->
+        <div class="field">
+            <label>Competition Report</label>
+            <input type="text" ref="report" placeholder="Example: https://example.com/report.pdf" onchange="{form_updated}">
+        </div>
+
+        <!--  Fact Sheet  -->
         <div class="field smaller-mde">
             <label>Fact Sheet</label>
             <div class="row">
@@ -82,6 +131,8 @@
             </div>
             </form>
         </div>
+
+        <!--  Files Available  -->
         <div class="field smaller-mde">
             <label>
                 Files Available
@@ -103,29 +154,12 @@
                 <input type="checkbox" ref="make_input_data_available" onchange="{form_updated}">
             </div>
         </div>
+
+        <!--  Detailed results  -->
         <div class="field">
-            <label>Queue</label>
-            <select class="ui fluid search selection dropdown" ref="queue"></select>
-        </div>
-        <div class="field required">
-            <label>Competition Docker Image</label>
-            <input type="text" ref="docker_image" placeholder="Example: codalab/codalab-legacy:py37" onchange="{form_updated}">
-        </div>
-        <div class="field">
-            <label>Competition Type</label>
-            <div ref="competition_type" class="ui selection dropdown">
-                <input type="hidden" name="competition_type" value="{ data.competition_type || 'competition' }" onchange="{form_updated}">
-                <div class="text">Competition</div>
-                <i class="dropdown icon"></i>
-                <div class="menu">
-                    <div class="item" data-value="competition">Competition</div>
-                    <div class="item" data-value="benchmark">Benchmark</div>
-                </div>
-            </div>
-        </div>
-        <div class="field">
+            <label>Detailed Results</label>
             <div class="ui checkbox">
-                <label>Enable Visualizations</label>
+                <label>Enable Detailed Results</label>
                 <input type="checkbox" ref="detailed_results" onchange="{form_updated}">
             </div>
             <sup>
@@ -135,8 +169,35 @@
                     <i class="grey question circle icon"></i>
                 </a>
             </sup>
+            <br>
+            <div class="ui checkbox">
+                <label>Show Detailed Results in submission pannel</label>
+                <input type="checkbox" ref="show_detailed_results_in_submission_panel" onchange="{form_updated}">
+            </div>
+            <sup>
+                <span data-tooltip="If checked and detailed results are enabled, participants can see detailed results in submission panel"
+                          data-inverted=""
+                          data-position="bottom center">
+                    <i class="help icon circle"></i>
+                </span>
+            </sup>
+            <br>
+            <div class="ui checkbox">
+                <label>Show Detailed Results in leaderboard</label>
+                <input type="checkbox" ref="show_detailed_results_in_leaderboard" onchange="{form_updated}">
+            </div>
+            <sup>
+                <span data-tooltip="If checked and detailed results are enabled, participants can see detailed results in leaderboard"
+                          data-inverted=""
+                          data-position="bottom center">
+                    <i class="help icon circle"></i>
+                </span>
+            </sup>
         </div>
+
+        <!--  Auto Run submissions  -->
         <div class="field">
+            <label>Submission execution</label>
             <div class="ui checkbox">
                 <label>Auto-run submissions</label>
                 <input type="checkbox" ref="auto_run_submissions" onchange="{form_updated}">
@@ -149,18 +210,24 @@
                 </span>
             </sup>
         </div>
+
+        <!--  Public submissions  -->
         <div class="field">
-            <label>Competition Reward</label>
-            <input type="text" ref="reward" placeholder="Example: $1000 for the top participant" onchange="{form_updated}">
-        </div>
-        <div class="field">
-            <label>Organizer Contact Email</label>
-            <input type="email" ref="contact_email" placeholder="Example: email@example.com" onchange="{form_updated}">
-        </div>
-        <div class="field">
-            <label>Competition Report</label>
-            <input type="text" ref="report" placeholder="Example: https://example.com/report.pdf" onchange="{form_updated}">
+            <label>Public Submissions</label>
+            <div class="ui checkbox">
+                <label>Participants can make submission public</label>
+                <input type="checkbox" ref="can_participants_make_submissions_public" onchange="{form_updated}">
+            </div>
+            <sup>
+                <span data-tooltip="If unchecked, participants cannot make their submissions public from submission panel"
+                          data-inverted=""
+                          data-position="bottom center">
+                    <i class="help icon circle"></i>
+                </span>
+            </sup>
         </div>
+
+        
     </div>
 
     <script>
@@ -226,7 +293,10 @@
             self.data["description"] = self.markdown_editor.value()
             self.data["queue"] = self.refs.queue.value
             self.data["enable_detailed_results"] = self.refs.detailed_results.checked
+            self.data["show_detailed_results_in_submission_panel"] = self.refs.show_detailed_results_in_submission_panel.checked
+            self.data["show_detailed_results_in_leaderboard"] = self.refs.show_detailed_results_in_leaderboard.checked
             self.data["auto_run_submissions"] = self.refs.auto_run_submissions.checked
+            self.data["can_participants_make_submissions_public"] = self.refs.can_participants_make_submissions_public.checked
             self.data["make_programs_available"] = self.refs.make_programs_available.checked
             self.data["make_input_data_available"] = self.refs.make_input_data_available.checked
             self.data["docker_image"] = $(self.refs.docker_image).val()
@@ -360,7 +430,10 @@
                     .dropdown('set value', competition.queue.id)
             }
             self.refs.detailed_results.checked = competition.enable_detailed_results
+            self.refs.show_detailed_results_in_submission_panel.checked = competition.show_detailed_results_in_submission_panel
+            self.refs.show_detailed_results_in_leaderboard.checked = competition.show_detailed_results_in_leaderboard
             self.refs.auto_run_submissions.checked = competition.auto_run_submissions
+            self.refs.can_participants_make_submissions_public.checked = competition.can_participants_make_submissions_public
             self.refs.make_programs_available.checked = competition.make_programs_available
             self.refs.make_input_data_available.checked = competition.make_input_data_available
             $(self.refs.docker_image).val(competition.docker_image)
diff --git a/src/tests/functional/test_submissions.py b/src/tests/functional/test_submissions.py
index 2beba29f1..6248ccaf2 100644
--- a/src/tests/functional/test_submissions.py
+++ b/src/tests/functional/test_submissions.py
@@ -18,7 +18,7 @@ def setUp(self):
         super().setUp()
         self.user = UserFactory(password='test')
 
-    def _run_submission_and_add_to_leaderboard(self, competition_zip_path, submission_zip_path, expected_submission_output, has_solutions=True, timeout=600, precision=2):
+    def _run_submission_and_add_to_leaderboard(self, competition_zip_path, submission_zip_path, expected_submission_output, has_solutions=True, has_detailed_result=True, timeout=600, precision=2):
         """Creates a competition and runs a submission inside it, waiting for expected output to
         appear in submission realtime output panel.
 
@@ -68,7 +68,8 @@ def _run_submission_and_add_to_leaderboard(self, competition_zip_path, submissio
         submission_id = int(self.find('submission-manager#user-submission-table table tbody tr:nth-of-type(1) td:nth-of-type(1)').text)
 
         # Add the submission to the leaderboard and go to results tab
-        self.find('submission-manager#user-submission-table table tbody tr:nth-of-type(1) td:nth-of-type(6) span[data-tooltip="Add to Leaderboard"]').click()
+        add_to_leaderboard_column = 7 if has_detailed_result else 6
+        self.find(f'submission-manager#user-submission-table table tbody tr:nth-of-type(1) td:nth-of-type({add_to_leaderboard_column}) span[data-tooltip="Add to Leaderboard"]').click()
         self.find('.item[data-tab="results-tab"]').click()
 
         # The leaderboard table lists our submission
@@ -82,7 +83,7 @@ def test_v15_iris_code_submission_end_to_end(self):
         self._run_submission_and_add_to_leaderboard('competition_15_iris.zip', 'submission_15_iris_code.zip', '======= Set 1 (Iris_test)', has_solutions=False, precision=4)
 
     def test_v18_submission_end_to_end(self):
-        self._run_submission_and_add_to_leaderboard('competition_18.zip', 'submission_18.zip', 'results', has_solutions=False)
+        self._run_submission_and_add_to_leaderboard('competition_18.zip', 'submission_18.zip', 'results', has_solutions=False, has_detailed_result=False)
 
     def test_v2_submission_end_to_end(self):
-        self._run_submission_and_add_to_leaderboard('competition.zip', 'submission.zip', 'Scores')
+        self._run_submission_and_add_to_leaderboard('competition.zip', 'submission.zip', 'Scores', has_detailed_result=False)