diff --git a/src/apps/api/serializers/datasets.py b/src/apps/api/serializers/datasets.py
index 21f0d6f13..0b44b7ec1 100644
--- a/src/apps/api/serializers/datasets.py
+++ b/src/apps/api/serializers/datasets.py
@@ -24,6 +24,8 @@ class Meta:
             'created_by',
             'data_file',
             'was_created_by_competition',
+            'competition',
+            'file_name',
         )
         read_only_fields = (
             'key',
@@ -71,6 +73,7 @@ class Meta:
 
 class DataDetailSerializer(serializers.ModelSerializer):
     created_by = serializers.CharField(source='created_by.username')
+    competition = serializers.SerializerMethodField()
 
     class Meta:
         model = Data
@@ -86,8 +89,20 @@ class Meta:
             'was_created_by_competition',
             'in_use',
             'file_size',
+            'competition',
+            'file_name',
         )
 
+    def get_competition(self, obj):
+
+        # return competition dict with id and title if available
+        if obj.competition:
+            return {
+                "id": obj.competition.id,
+                "title": obj.competition.title,
+            }
+        return None
+
 
 class DataGroupSerializer(serializers.ModelSerializer):
     class Meta:
diff --git a/src/apps/api/serializers/tasks.py b/src/apps/api/serializers/tasks.py
index 521c8f64c..deac682cc 100644
--- a/src/apps/api/serializers/tasks.py
+++ b/src/apps/api/serializers/tasks.py
@@ -7,6 +7,7 @@
 from competitions.models import PhaseTaskInstance, Phase
 from datasets.models import Data
 from tasks.models import Task, Solution
+from competitions.models import Competition
 
 
 class SolutionSerializer(WritableNestedModelSerializer):
@@ -138,7 +139,12 @@ class Meta:
         )
 
     def get_competitions(self, instance):
-        return self.context['task_titles'][instance.pk]
+
+        # Fech competitions which hase phases with this task
+        # competitions = Phase.objects.filter(tasks__in=[instance.pk]).values('competition')
+        competitions = Competition.objects.filter(phases__tasks__in=[instance.pk]).values("id", "title").distinct()
+
+        return competitions
 
     def get_shared_with(self, instance):
         return self.context['shared_with'][instance.pk]
diff --git a/src/apps/api/tests/test_datasets.py b/src/apps/api/tests/test_datasets.py
index 9ac798553..664178116 100644
--- a/src/apps/api/tests/test_datasets.py
+++ b/src/apps/api/tests/test_datasets.py
@@ -21,6 +21,7 @@ def test_dataset_api_checks_duplicate_names_for_same_user(self):
             'name': 'Test!',
             'type': Data.COMPETITION_BUNDLE,
             'request_sassy_file_name': faker.file_name(),
+            'file_name': faker.file_name(),
         })
 
         assert resp.status_code == 400
diff --git a/src/apps/api/views/competitions.py b/src/apps/api/views/competitions.py
index b104c69a6..12a40cf6e 100644
--- a/src/apps/api/views/competitions.py
+++ b/src/apps/api/views/competitions.py
@@ -62,7 +62,8 @@ def get_queryset(self):
                 qs = Competition.objects.filter(
                     (Q(created_by=self.request.user)) |
                     (Q(collaborators__in=[self.request.user]))
-                )
+                ).distinct()
+
             participating_in = self.request.query_params.get('participating_in', None)
             if participating_in:
                 qs = qs.filter(participants__user=self.request.user, participants__status="approved")
@@ -155,6 +156,23 @@ def create(self, request, *args, **kwargs):
             for index in range(len(phase['tasks'])):
                 phase['tasks'][index] = phase['tasks'][index]['task']
 
+        # TODO - This is Temporary. Need to change Leaderboard to Phase connect to M2M and handle this correctly.
+        # save leaderboard individually, then pass pk to each phase
+        print(f"{request.data['leaderboards']}")
+        data = request.data
+        if 'leaderboards' in data:
+            leaderboard_data = data['leaderboards'][0]
+            if(leaderboard_data['id']):
+                leaderboard_instance = Leaderboard.objects.get(id=leaderboard_data['id'])
+                leaderboard = LeaderboardSerializer(leaderboard_instance, data=data['leaderboards'][0])
+            else:
+                leaderboard = LeaderboardSerializer(data=data['leaderboards'][0])
+            leaderboard.is_valid()
+            leaderboard.save()
+            leaderboard_id = leaderboard["id"].value
+            for phase in data['phases']:
+                phase['leaderboard'] = leaderboard_id
+
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
         self.perform_create(serializer)
diff --git a/src/apps/api/views/datasets.py b/src/apps/api/views/datasets.py
index 7bc235171..c000278da 100644
--- a/src/apps/api/views/datasets.py
+++ b/src/apps/api/views/datasets.py
@@ -20,14 +20,51 @@
 class DataViewSet(ModelViewSet):
     queryset = Data.objects.all()
     filter_backends = (DjangoFilterBackend, SearchFilter)
-    filter_fields = ('type', 'name', 'key', 'was_created_by_competition')
+    filter_fields = ('type', 'name', 'key', 'was_created_by_competition', 'is_public')
     search_fields = ('name', 'description', 'key',)
     pagination_class = BasicPagination
 
     def get_queryset(self):
-        filters = Q(is_public=True) | Q(created_by=self.request.user)
 
-        qs = Data.objects.filter(filters)
+        if self.request.method == 'GET':
+
+            # new filters
+            # -----------
+
+            # _public = true if want to show public datasets/submissions
+            is_public = self.request.query_params.get('_public', 'false') == 'true'
+
+            # _type = submission if called from submissions tab to filter only submissions
+            is_submission = self.request.query_params.get('_type', '') == 'submission'
+
+            # _type = dataset if called from datasets and programs tab to filter datasets and programs
+            is_dataset = self.request.query_params.get('_type', '') == 'dataset'
+
+            # get queryset
+            qs = self.queryset
+
+            # filter submissions
+            if is_submission:
+                qs = qs.filter(Q(type=Data.SUBMISSION))
+
+            # filter datasets and programs
+            if is_dataset:
+                qs = qs.filter(~Q(type=Data.SUBMISSION))
+
+            # public filter check
+            if is_public:
+                qs = qs.filter(Q(created_by=self.request.user) | Q(is_public=True))
+            else:
+                qs = qs.filter(Q(created_by=self.request.user))
+
+            # if GET is called but provided no filters, fall back to default behaviour
+            if (not is_submission) and (not is_dataset) and (not is_public):
+                qs = self.queryset
+                qs = qs.filter(Q(is_public=True) | Q(created_by=self.request.user))
+
+        else:
+            qs = self.queryset
+            qs = qs.filter(Q(is_public=True) | Q(created_by=self.request.user))
 
         qs = qs.exclude(Q(type=Data.COMPETITION_BUNDLE) | Q(name__isnull=True))
 
@@ -42,6 +79,7 @@ def get_serializer_class(self):
             return serializers.DataSerializer
 
     def create(self, request, *args, **kwargs):
+
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
         new_dataset = serializer.save()  # request_sassy_file_name is temporarily set via this serializer
diff --git a/src/apps/datasets/migrations/0005_auto_20230527_0837.py b/src/apps/datasets/migrations/0005_auto_20230527_0837.py
new file mode 100644
index 000000000..7fd349ef9
--- /dev/null
+++ b/src/apps/datasets/migrations/0005_auto_20230527_0837.py
@@ -0,0 +1,25 @@
+# Generated by Django 2.2.17 on 2023-05-27 08:37
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('competitions', '0032_submission_worker_hostname'),
+        ('datasets', '0004_data_deleted'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='data',
+            name='competition',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='submission', to='competitions.Competition'),
+        ),
+        migrations.AddField(
+            model_name='data',
+            name='file_name',
+            field=models.CharField(default='', max_length=64),
+        ),
+    ]
diff --git a/src/apps/datasets/migrations/0006_auto_20230528_0829.py b/src/apps/datasets/migrations/0006_auto_20230528_0829.py
new file mode 100644
index 000000000..8e51ba6c3
--- /dev/null
+++ b/src/apps/datasets/migrations/0006_auto_20230528_0829.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.2.17 on 2023-05-28 08:29
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('datasets', '0005_auto_20230527_0837'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='data',
+            name='competition',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='submission', to='competitions.Competition'),
+        ),
+    ]
diff --git a/src/apps/datasets/models.py b/src/apps/datasets/models.py
index 9165814e8..3d97e8b45 100644
--- a/src/apps/datasets/models.py
+++ b/src/apps/datasets/models.py
@@ -10,6 +10,7 @@
 from chahub.models import ChaHubSaveMixin
 from utils.data import PathWrapper
 from utils.storage import BundleStorage
+from competitions.models import Competition
 
 
 class Data(ChaHubSaveMixin, models.Model):
@@ -57,6 +58,9 @@ class Data(ChaHubSaveMixin, models.Model):
     # are NOT marked True, since they are not created by unpacking!
     was_created_by_competition = models.BooleanField(default=False)
 
+    competition = models.ForeignKey(Competition, on_delete=models.PROTECT, null=True, related_name='submission')
+    file_name = models.CharField(max_length=64, default="")
+
     def get_download_url(self):
         return reverse('datasets:download', kwargs={'key': self.key})
 
@@ -84,7 +88,7 @@ def in_use(self):
             Q(phases__tasks__input_data=self) |
             Q(phases__tasks__reference_data=self) |
             Q(phases__tasks__scoring_program=self)
-        ).values_list('pk', flat=True).distinct()
+        ).values('pk', 'title').distinct()
         return competitions_in_use
 
     def __str__(self):
diff --git a/src/apps/profiles/views.py b/src/apps/profiles/views.py
index 8abbf94b2..9a19090dd 100644
--- a/src/apps/profiles/views.py
+++ b/src/apps/profiles/views.py
@@ -130,6 +130,10 @@ def sign_up(request):
 
 def log_in(request):
 
+    # Fectch next redirect page after login
+    # default : None
+    next = request.GET.get('next', None)
+
     context = {}
     context['chahub_signup_url'] = "{}/profiles/signup?next={}/social/login/chahub".format(
         settings.SOCIAL_AUTH_CHAHUB_BASE_URL,
@@ -144,7 +148,13 @@ def log_in(request):
             user = authenticate(username=username, password=password)
             if user:
                 login(request, user)
-                return redirect('pages:home')
+
+                # if next is none redirect to home
+                # otherwise redirect to requested page
+                if next is None:
+                    return redirect('pages:home')
+                else:
+                    return redirect(next)
             else:
                 messages.error(request, "Wrong Credentials!")
         else:
diff --git a/src/static/js/ours/client.js b/src/static/js/ours/client.js
index fd747afd1..5a912ffb4 100644
--- a/src/static/js/ours/client.js
+++ b/src/static/js/ours/client.js
@@ -153,6 +153,7 @@ CODALAB.api = {
     create_dataset: function (metadata, data_file, progress_update_callback) {
         // Pass the requested file name for the SAS url
         metadata.request_sassy_file_name = data_file.name
+        metadata.file_name = data_file.name
 
         // This will be set on successful dataset creation, then used to complete the dataset upload
         var dataset = {}
diff --git a/src/static/riot/competitions/detail/submission_upload.tag b/src/static/riot/competitions/detail/submission_upload.tag
index f1405cfb9..76728a5ee 100644
--- a/src/static/riot/competitions/detail/submission_upload.tag
+++ b/src/static/riot/competitions/detail/submission_upload.tag
@@ -11,8 +11,8 @@
                     <h2>Metadata or Fact Sheet</h2>
                     <div class="submission-form-question" each="{ question in opts.fact_sheet }">
                         <span if="{ question.type === 'text' }">
-                            <label if="{question.is_required}" class="required-answer" for="{ question.key }">{ question.title }:</label>
-                            <label if="{!question.is_required}" for="{ question.key }">{ question.title }:</label>
+                            <label if="{question.is_required == 'true'}" class="required-answer" for="{ question.key }">{ question.title }:</label>
+                            <label if="{question.is_required == 'false'}" for="{ question.key }">{ question.title }:</label>
                             <input type="text" name="{ question.key }">
                         </span>
                         <span if="{ question.type === 'checkbox' }">
@@ -413,7 +413,8 @@
                 task_ids_to_run = [self.selected_tasks[0].id]
             }
             var data_file_metadata = {
-                type: 'submission'
+                type: 'submission',
+                competition: self.opts.competition.id
             }
             var data_file = self.refs.data_file.refs.file_input.files[0]
             self.children = []
diff --git a/src/static/riot/competitions/editor/_phases.tag b/src/static/riot/competitions/editor/_phases.tag
index acf1b72a5..532f49500 100644
--- a/src/static/riot/competitions/editor/_phases.tag
+++ b/src/static/riot/competitions/editor/_phases.tag
@@ -112,7 +112,7 @@
                         <div class="three fields">
                             <div class="field">
                                 <label>
-                                    Execution Time Limit <span data-tooltip="In milliseconds, 600ms default if unset"
+                                    Execution Time Limit <span data-tooltip="In seconds, 600s default if unset"
                                                                data-inverted=""
                                                                data-position="bottom center">
                                     <i class="help icon circle"></i></span>
diff --git a/src/static/riot/datasets/management.tag b/src/static/riot/datasets/management.tag
index 8d3f55713..3f802592e 100644
--- a/src/static/riot/datasets/management.tag
+++ b/src/static/riot/datasets/management.tag
@@ -1,7 +1,6 @@
 <data-management>
-    <!-------------------------------------
-             Search and filter bits
-      ------------------------------------->
+    <!-- Search and filter bits -->
+      
     <div class="ui icon input">
         <input type="text" placeholder="Search..." ref="search" onkeyup="{ filter.bind(this, undefined) }">
         <i class="search icon"></i>
@@ -15,24 +14,27 @@
         <label>Show Auto Created</label>
         <input type="checkbox" ref="auto_created">
     </div>
+    <div class="ui checkbox inline-div" onclick="{ filter.bind(this, undefined) }">
+        <label>Show Public</label>
+        <input type="checkbox" ref="show_public">
+    </div>
     <button class="ui green right floated labeled icon button" onclick="{show_creation_modal}">
         <i selenium="add-dataset" class="plus icon"></i>
-        Add Dataset
+        Add Dataset/Program
     </button>
     <button class="ui red right floated labeled icon button {disabled: marked_datasets.length === 0}" onclick="{delete_datasets}">
         <i class="icon delete"></i>
-        Delete Selected Datasets
+        Delete Selected
     </button>
 
-    <!-------------------------------------
-                  Data Table
-      ------------------------------------->
+    <!-- Data Table -->
     <table class="ui {selectable: datasets.length > 0} celled compact table">
         <thead>
         <tr>
-            <th>Name</th>
+            <th>File Name</th>
             <th width="175px">Type</th>
-            <th width="125px">Uploaded...</th>
+            <th width="175px">Size</th>
+            <th width="125px">Uploaded</th>
             <th width="60px">In Use</th>
             <th width="60px">Public</th>
             <th width="50px">Delete?</th>
@@ -45,6 +47,7 @@
             onclick="{show_info_modal.bind(this, dataset)}">
             <td>{ dataset.name }</td>
             <td>{ dataset.type }</td>
+            <td>{ format_file_size(dataset.file_size) }</td>
             <td>{ timeSince(Date.parse(dataset.created_when)) } ago</td>
             <td class="center aligned">
                 <i class="checkmark box icon green" show="{ dataset.in_use.length > 0 }"></i>
@@ -53,12 +56,12 @@
                 <i class="checkmark box icon green" show="{ dataset.is_public }"></i>
             </td>
             <td class="center aligned">
-                <button class="ui mini button red icon" onclick="{ delete_dataset.bind(this, dataset) }">
+                <button show="{dataset.created_by === CODALAB.state.user.username}" class="ui mini button red icon" onclick="{ delete_dataset.bind(this, dataset) }">
                     <i class="icon delete"></i>
                 </button>
             </td>
             <td class="center aligned">
-                <div class="ui fitted checkbox">
+                <div show="{dataset.created_by === CODALAB.state.user.username}" class="ui fitted checkbox">
                     <input type="checkbox" name="delete_checkbox" onclick="{ mark_dataset_for_deletion.bind(this, dataset) }">
                     <label></label>
                 </div>
@@ -73,11 +76,9 @@
         </tbody>
         <tfoot>
 
-        <!-------------------------------------
-                      Pagination
-        ------------------------------------->
+        <!-- Pagination -->
         <tr>
-            <th colspan="7" if="{datasets.length > 0}">
+            <th colspan="8" if="{datasets.length > 0}">
                 <div class="ui right floated pagination menu" if="{datasets.length > 0}">
                     <a show="{!!_.get(pagination, 'previous')}" class="icon item" onclick="{previous_page}">
                         <i class="left chevron icon"></i>
@@ -94,6 +95,7 @@
         </tfoot>
     </table>
 
+    <!--  Dataset Detail Model  -->
     <div ref="info_modal" class="ui modal">
         <div class="header">
             {selected_row.name}
@@ -129,14 +131,15 @@
             </virtual>
             <div show="{!!_.get(selected_row.in_use, 'length')}"><strong>Used by:</strong>
                 <div class="ui bulleted list">
-                    <div class="item" each="{id in selected_row.in_use}">
-                        <a href="{URLS.COMPETITION_DETAIL(id)}" target="_blank">Benchmark id: {id}</a>
+                    <div class="item" each="{comp in selected_row.in_use}">
+                        <a href="{URLS.COMPETITION_DETAIL(comp.pk)}" target="_blank">{comp.title}</a>
                     </div>
                 </div>
             </div>
         </div>
         <div class="actions">
-            <button class="ui primary icon button" onclick="{toggle_is_public}">
+            <button show="{selected_row.created_by === CODALAB.state.user.username}"
+                class="ui primary icon button" onclick="{toggle_is_public}">
                 <i class="share icon"></i> {selected_row.is_public ? "Make Private" : "Make Public"}
             </button>
             <a href="{URLS.DATASET_DOWNLOAD(selected_row.key)}" class="ui green icon button">
@@ -146,9 +149,9 @@
         </div>
     </div>
 
-
+    <!--  Add Dataset Model  -->
     <div ref="dataset_creation_modal" class="ui modal">
-        <div class="header">Form</div>
+        <div class="header">Add Dataset/Program Form</div>
 
         <div class="content">
             <div class="ui message error" show="{ Object.keys(errors).length > 0 }">
@@ -194,6 +197,7 @@
             <button class="ui basic red cancel button">Cancel</button>
         </div>
     </div>
+
     <script>
         var self = this
         self.mixin(ProgressBarMixin)
@@ -208,7 +212,6 @@
             "reference_data",
             "scoring_program",
             "starting_kit",
-            "submission",
         ]
         self.errors = []
         self.datasets = []
@@ -277,10 +280,9 @@
 
         self.update_datasets = function (filters) {
             filters = filters || {}
-            let show_datasets_created_by_comp = $(self.refs.auto_created).prop('checked')
-            if (!show_datasets_created_by_comp) {
-                filters.was_created_by_competition = false
-            }
+            filters.was_created_by_competition = $(self.refs.auto_created).prop('checked')
+            filters._public = $(self.refs.show_public).prop('checked')
+            filters._type = "dataset"
             CODALAB.api.get_datasets(filters)
                 .done(function (data) {
                     self.datasets = data.results
@@ -442,6 +444,30 @@
             }
         }
 
+
+        // Function to format file size 
+        self.format_file_size = function(file_size) {
+            // parse file size from string to float
+            try {
+                n = parseFloat(file_size)
+            }
+            catch(err) {
+                // return empty string if parsing fails
+                return ""
+            }
+            // constant units to show with files size
+            // file size is in KB, converting it to MB and GB 
+            const units = ['KB', 'MB', 'GB']
+            // loop incrementer for selecting desired unit
+            let i = 0
+            // loop over n until it is greater than 1000
+            while(n >= 1000 && ++i){
+                n = n/1000;
+            }
+            // restrict file size to 1 decimal number concatinated with unit
+            return(n.toFixed(1) + ' ' + units[i]);
+        }
+
     </script>
 
     <style type="text/stylus">
diff --git a/src/static/riot/management.tag b/src/static/riot/management.tag
index ad3b3560c..904093abf 100644
--- a/src/static/riot/management.tag
+++ b/src/static/riot/management.tag
@@ -2,7 +2,8 @@
     <!--Todo: ultimately decide whether this belongs on tasks:management or dataset:management
             Is currently at both locations-->
     <div class="ui top attached tabular menu">
-        <div class="active item" data-tab="datasets">Datasets</div>
+        <div class="active item" data-tab="submissions">Submissions</div>
+        <div class="item" data-tab="datasets">Datasets and programs</div>
         <div class="item" data-tab="tasks">Tasks</div>
         <div class="right menu">
             <div class="item">
@@ -12,7 +13,10 @@
             </div>
         </div>
     </div>
-    <div class="ui active bottom attached tab segment" data-tab="datasets">
+    <div class="ui active bottom attached tab segment" data-tab="submissions">
+        <submission-management></submission-management>
+    </div>
+    <div class="ui bottom attached tab segment" data-tab="datasets">
         <data-management></data-management>
     </div>
     <div class="ui bottom attached tab segment" data-tab="tasks">
diff --git a/src/static/riot/submissions/resource_submissions.tag b/src/static/riot/submissions/resource_submissions.tag
new file mode 100644
index 000000000..719676109
--- /dev/null
+++ b/src/static/riot/submissions/resource_submissions.tag
@@ -0,0 +1,448 @@
+<submission-management>
+
+    <!--  Search -->
+    <div class="ui icon input">
+        <input type="text" placeholder="Search..." ref="search" onkeyup="{ filter.bind(this, undefined) }">
+        <i class="search icon"></i>
+    </div>
+    <div class="ui checkbox inline-div" onclick="{ filter.bind(this, undefined) }">
+        <label>Show Public</label>
+        <input type="checkbox" ref="show_public">
+    </div>
+    <button class="ui green right floated labeled icon button" onclick="{show_creation_modal}">
+        <i class="plus icon"></i>
+        Add Submission
+    </button>
+    <button class="ui red right floated labeled icon button {disabled: marked_submissions.length === 0}" onclick="{delete_submissions}">
+        <i class="icon delete"></i>
+        Delete Selected Submissions
+    </button>
+
+    <!-- Data Table -->
+    <table class="ui {selectable: submissions.length > 0} celled compact table">
+        <thead>
+        <tr>
+            <th>File Name</th>
+            <th>Competition in</th>
+            <th width="175px">Size</th>
+            <th width="125px">Uploaded</th>
+            <th width="60px">Public</th>
+            <th width="50px">Delete?</th>
+            <th width="25px"></th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr each="{ submission, index in submissions }"
+            class="submission-row"
+            onclick="{show_info_modal.bind(this, submission)}">
+            <!--  show file name if exists otherwise show name(for old submissions)  -->
+            <td>{ submission.file_name || submission.name }</td>
+            <!--  show compeition name as link if competition is available -->
+            <td if="{submission.competition}"><a class="link-no-deco" target="_blank" href="../competitions/{ submission.competition.id }">{ submission.competition.title }</a></td>
+            <!--  show empty td if competition is not available  -->
+            <td if="{!submission.competition}"></td>
+            <td>{ format_file_size(submission.file_size) }</td>
+            <td>{ timeSince(Date.parse(submission.created_when)) } ago</td>
+            <td class="center aligned">
+                <i class="checkmark box icon green" show="{ submission.is_public }"></i>
+            </td>
+            <td class="center aligned">
+                <button show="{submission.created_by === CODALAB.state.user.username}" class="ui mini button red icon" onclick="{ delete_submission.bind(this, submission) }">
+                    <i class="icon delete"></i>
+                </button>
+            </td>
+            <td class="center aligned">
+                <div show="{submission.created_by === CODALAB.state.user.username}" class="ui fitted checkbox">
+                    <input type="checkbox" name="delete_checkbox" onclick="{ mark_submission_for_deletion.bind(this, submission) }">
+                    <label></label>
+                </div>
+            </td>
+        </tr>
+
+        <tr if="{submissions.length === 0}">
+            <td class="center aligned" colspan="6">
+                <em>No Submissions Yet!</em>
+            </td>
+        </tr>
+        </tbody>
+        <tfoot>
+
+        <!-- Pagination -->
+        <tr>
+            <th colspan="8" if="{submissions.length > 0}">
+                <div class="ui right floated pagination menu" if="{submissions.length > 0}">
+                    <a show="{!!_.get(pagination, 'previous')}" class="icon item" onclick="{previous_page}">
+                        <i class="left chevron icon"></i>
+                    </a>
+                    <div class="item">
+                        <label>{page}</label>
+                    </div>
+                    <a show="{!!_.get(pagination, 'next')}" class="icon item" onclick="{next_page}">
+                        <i class="right chevron icon"></i>
+                    </a>
+                </div>
+            </th>
+        </tr>
+        </tfoot>
+    </table>
+
+    <!--  Submission Detail Model  -->
+    <div ref="info_modal" class="ui modal">
+        <div class="header">
+            {selected_row.file_name || selected_row.name}
+        </div>
+        <div class="content">
+            <h3>Details</h3>
+
+            <table class="ui basic table">
+                <thead>
+                <tr>
+                    <th>Key</th>
+                    <th>Competition in</th>
+                    <th>Created By</th>
+                    <th>Created</th>
+                    <th>Type</th>
+                    <th>Public</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr>
+                    <td>{selected_row.key}</td>
+                    <!--  show compeition name as link if competition is available -->
+                    <td if="{selected_row.competition}"><a class="link-no-deco" target="_blank" href="../competitions/{ selected_row.competition.id }">{ selected_row.competition.title }</a></td>
+                    <!--  show empty td if competition is not available  -->
+                    <td if="{!selected_row.competition}"></td>
+                    <td>{selected_row.created_by}</td>
+                    <td>{pretty_date(selected_row.created_when)}</td>
+                    <td>{_.startCase(selected_row.type)}</td>
+                    <td>{_.startCase(selected_row.is_public)}</td>
+                </tr>
+                </tbody>
+            </table>
+            <virtual if="{!!selected_row.description}">
+                <div>Description:</div>
+                <div class="ui segment">
+                    {selected_row.description}
+                </div>
+            </virtual>
+        </div>
+        <div class="actions">
+            <button show="{selected_row.created_by === CODALAB.state.user.username}"
+                class="ui primary icon button" onclick="{toggle_is_public}">
+                <i class="share icon"></i> {selected_row.is_public ? "Make Private" : "Make Public"}
+            </button>
+            <a href="{URLS.DATASET_DOWNLOAD(selected_row.key)}" class="ui green icon button">
+                <i class="download icon"></i>Download File
+            </a>
+            <button class="ui cancel button">Close</button>
+        </div>
+    </div>
+
+    <!--  Add Submission Model  -->
+    <div ref="submission_creation_modal" class="ui modal">
+        <div class="header">Add Submission Form</div>
+
+        <div class="content">
+            <div class="ui message error" show="{ Object.keys(errors).length > 0 }">
+                <div class="header">
+                    Error(s) creating submission
+                </div>
+                <ul class="list">
+                    <li each="{ error, field in errors }">
+                        <strong>{field}:</strong> {error}
+                    </li>
+                </ul>
+            </div>
+
+            <form class="ui form coda-animated {error: errors}" ref="form">
+                <input-text name="name" ref="name" error="{errors.name}" placeholder="Name"></input-text>
+                <input-text name="description" ref="description" error="{errors.description}"
+                            placeholder="Description"></input-text>
+
+                <input type=hidden name="type" ref="type" value="submission">
+                
+                <input-file name="data_file" ref="data_file" error="{errors.data_file}"
+                            accept=".zip"></input-file>
+            </form>
+
+            <div class="ui indicating progress" ref="progress">
+                <div class="bar">
+                    <div class="progress">{ upload_progress }%</div>
+                </div>
+            </div>
+
+        </div>
+        <div class="actions">
+            <button class="ui blue icon button" onclick="{check_form}">
+                <i class="upload icon"></i>
+                Upload
+            </button>
+            <button class="ui basic red cancel button">Cancel</button>
+        </div>
+    </div>
+
+    <script>
+        var self = this
+        self.mixin(ProgressBarMixin)
+
+        /*---------------------------------------------------------------------
+         Init
+        ---------------------------------------------------------------------*/
+        self.errors = []
+        self.submissions = []
+        self.selected_row = {}
+        self.marked_submissions = []
+
+        self.upload_progress = undefined
+
+        self.page = 1
+
+        self.one("mount", function () {
+            $(".ui.dropdown", self.root).dropdown()
+            $(".ui.checkbox", self.root).checkbox()
+            self.update_submissions()
+        })
+
+        self.show_info_modal = function (row, e) {
+            // Return here so the info modal doesn't pop up when a checkbox is clicked
+            if (e.target.type === 'checkbox') {
+                return
+            }
+            self.selected_row = row
+            self.update()
+            $(self.refs.info_modal).modal('show')
+        }
+
+        self.show_creation_modal = function () {
+            $(self.refs.submission_creation_modal).modal('show')
+        }
+
+
+        /*---------------------------------------------------------------------
+         Methods
+        ---------------------------------------------------------------------*/
+        self.pretty_date = date => luxon.DateTime.fromISO(date).toLocaleString(luxon.DateTime.DATE_FULL)
+
+        self.filter = function (filters) {
+            filters = filters || {}
+            _.defaults(filters, {
+                search: $(self.refs.search).val(),
+                page: 1,
+            })
+            self.page = filters.page
+            self.update_submissions(filters)
+        }
+
+        self.next_page = function () {
+            if (!!self.pagination.next) {
+                self.page += 1
+                self.filter({page: self.page})
+            } else {
+                alert("No valid page to go to!")
+            }
+        }
+        self.previous_page = function () {
+            if (!!self.pagination.previous) {
+                self.page -= 1
+                self.filter({page: self.page})
+            } else {
+                alert("No valid page to go to!")
+            }
+        }
+
+        self.update_submissions = function (filters) {
+            filters = filters || {}
+            filters._public = $(self.refs.show_public).prop('checked')
+            filters._type = "submission"
+            CODALAB.api.get_datasets(filters)
+                .done(function (data) {
+                    self.submissions = data.results
+                    self.pagination = {
+                        "count": data.count,
+                        "next": data.next,
+                        "previous": data.previous
+                    }
+                    self.update()
+                })
+                .fail(function (response) {
+                    toastr.error("Could not load submissions...")
+                })
+        }
+
+        self.delete_submission = function (submission, e) {
+            name = submission.file_name || submission.name
+            if (confirm(`Are you sure you want to delete '${name}'?`)) {
+                CODALAB.api.delete_dataset(submission.id)
+                    .done(function () {
+                        self.update_submissions()
+                        toastr.success("Submission deleted successfully!")
+                    })
+                    .fail(function (response) {
+                        toastr.error(response.responseJSON['error'])
+                    })
+            }
+            event.stopPropagation()
+        }
+
+        self.delete_submissions = function () {
+            if (confirm(`Are you sure you want to delete multiple submissions?`)) {
+                CODALAB.api.delete_datasets(self.marked_submissions)
+                    .done(function () {
+                        self.update_submissions()
+                        toastr.success("Submission deleted successfully!")
+                        self.marked_submissions = []
+                    })
+                    .fail(function (response) {
+                        for (e in response.responseJSON) {
+                            toastr.error(`${e}: '${response.responseJSON[e]}'`)
+                        }
+                    })
+            }
+            event.stopPropagation()
+        }
+
+        self.clear_form = function () {
+            // Clear form
+            $(':input', self.refs.form)
+                .not(':button, :submit, :reset, :hidden')
+                .val('')
+                .removeAttr('checked')
+                .removeAttr('selected');
+
+            
+            self.errors = {}
+            self.update()
+        }
+
+        self.check_form = function (event) {
+            if (event) {
+                event.preventDefault()
+            }
+
+            // Reset upload progress, in case we're trying to re-upload or had errors -- this is the
+            // best place to do it -- also resets animations
+            self.file_upload_progress_handler(undefined)
+
+            // Let's do some quick validation
+            self.errors = {}
+            var validate_data = get_form_data(self.refs.form)
+
+            var required_fields = ['name', 'type', 'data_file']
+            required_fields.forEach(field => {
+                if (validate_data[field] === '') {
+                    self.errors[field] = "This field is required"
+                }
+            })
+
+            if (Object.keys(self.errors).length > 0) {
+                // display errors and drop out
+                self.update()
+                return
+            }
+
+            // Call the progress bar wrapper and do the upload -- we want to check and display errors
+            // first before doing the actual upload
+            self.prepare_upload(self.upload)()
+
+        }
+
+        self.upload = function () {
+            // Have to get the "FormData" to get the file in a special way
+            // jquery likes to work with
+            var metadata = get_form_data(self.refs.form)
+            delete metadata.data_file  // dont send this with metadata
+
+            if (metadata.is_public === 'on') {
+                var public_confirm = confirm("Creating a public submission means this will be sent to Chahub and publicly available on the internet. Are you sure you wish to continue?")
+                if (!public_confirm) {
+                    return
+                }
+            }
+
+            var data_file = self.refs.data_file.refs.file_input.files[0]
+
+            CODALAB.api.create_dataset(metadata, data_file, self.file_upload_progress_handler)
+                .done(function (data) {
+                    toastr.success("Submission successfully uploaded!")
+                    self.update_submissions()
+                    self.clear_form()
+                    $(self.refs.submission_creation_modal).modal('hide')
+                })
+                .fail(function (response) {
+                    if (response) {
+                        try {
+                            var errors = JSON.parse(response.responseText)
+
+                            // Clean up errors to not be arrays but plain text
+                            Object.keys(errors).map(function (key, index) {
+                                errors[key] = errors[key].join('; ')
+                            })
+
+                            self.update({errors: errors})
+                        } catch (e) {
+
+                        }
+                    }
+                    toastr.error("Creation failed, error occurred")
+                })
+                .always(function () {
+                    self.hide_progress_bar()
+                })
+        }
+
+        self.toggle_is_public = () => {
+            let message = self.selected_row.is_public
+                ? 'Are you sure you want to make this submission private? It will no longer be available to other users.'
+                : 'Are you sure you want to make this submission public? It will become visible to everyone'
+            if (confirm(message)) {
+                CODALAB.api.update_dataset(self.selected_row.id, {id: self.selected_row.id, is_public: !self.selected_row.is_public})
+                    .done(data => {
+                        toastr.success('Submission updated')
+                        $(self.refs.info_modal).modal('hide')
+                        self.filter()
+                    })
+                    .fail(resp => {
+                        toastr.error(resp.responseJSON['is_public'])
+                    })
+            }
+        }
+
+        self.mark_submission_for_deletion = function(submission, e) {
+            if (e.target.checked) {
+                self.marked_submissions.push(submission.id)
+            }
+            else {
+                self.marked_submissions.splice(self.marked_submissions.indexOf(submission.id), 1)
+            }
+        }
+
+        // Function to format file size 
+        self.format_file_size = function(file_size) {
+            // parse file size from string to float
+            try {
+                n = parseFloat(file_size)
+            }
+            catch(err) {
+                // return empty string if parsing fails
+                return ""
+            }
+            // constant units to show with files size
+            // file size is in KB, converting it to MB and GB 
+            const units = ['KB', 'MB', 'GB']
+            // loop incrementer for selecting desired unit
+            let i = 0
+            // loop over n until it is greater than 1000
+            while(n >= 1000 && ++i){
+                n = n/1000;
+            }
+            // restrict file size to 1 decimal number concatinated with unit
+            return(n.toFixed(1) + ' ' + units[i]);
+        }
+
+    </script>
+
+    <style type="text/stylus">
+        .submission-row:hover
+            cursor pointer
+    </style>
+</submission-management>
diff --git a/src/static/riot/tasks/management.tag b/src/static/riot/tasks/management.tag
index 6e8fe4c4d..b262d5fd7 100644
--- a/src/static/riot/tasks/management.tag
+++ b/src/static/riot/tasks/management.tag
@@ -30,7 +30,15 @@
         <tbody>
         <tr each="{ task in tasks }" onclick="{show_detail_modal.bind(this, task)}" class="task-row">
             <td>{ task.name }</td>
-            <td class="benchmark-row">{ task.competitions.join(', ') }</td>
+            <td class="benchmark-row">
+                <div show="{task.competitions.length > 0}" class="ui list">
+                    <div class="item" each="{comp in task.competitions}">
+                        <a href="{URLS.COMPETITION_DETAIL(comp.id)}" target="_blank">{comp.title}</a>
+                    </div>
+                </div>
+            
+            
+            </td>
             <td>{ task.shared_with.join(', ') }</td>
             <td>{ timeSince(Date.parse(task.created_when)) } ago</td>
             <td class="center aligned">
@@ -58,7 +66,7 @@
         <tfoot>
         <!-------------------------------------
                   Pagination
-        ------------------------------------->
+        -------------------------------------->
         <tr if="{tasks.length > 0}">
             <th colspan="7">
                 <div class="ui right floated pagination menu" if="{tasks.length > 0}">
@@ -156,7 +164,7 @@
         <div class="content">
             <div class="ui pointing menu">
                 <div class="active item modal-item" data-tab="details">Details</div>
-                <div class="item modal-item" data-tab="data">Datasets</div>
+                <div class="item modal-item" data-tab="data">Datasets and programs</div>
             </div>
             <form class="ui form" ref="form">
                 <div class="ui active tab" data-tab="details">
diff --git a/src/templates/pages/server_status.html b/src/templates/pages/server_status.html
index 0ff214291..8e4bc172b 100644
--- a/src/templates/pages/server_status.html
+++ b/src/templates/pages/server_status.html
@@ -24,7 +24,7 @@ <h1>Recent submissions (up to 250 or 2 days old)</h1>
                 {% endif %}
                 {% for submission in submissions %}
                 <tr>
-                    <td>{{ submission.phase.competition }}</td>
+                    <td><a class="link-no-deco" target="_blank" href="./competitions/{{ submission.phase.competition.id }}">{{ submission.phase.competition.title }}</a></td>
                     <td>{{ submission.pk }}</td>
                     <td>{{ submission.owner.username }}</td>
                     <td>{{ submission.worker_hostname }}</td>
diff --git a/src/tests/functional/test_competitions.py b/src/tests/functional/test_competitions.py
index 7a1e2cc48..0bd8e3d8b 100644
--- a/src/tests/functional/test_competitions.py
+++ b/src/tests/functional/test_competitions.py
@@ -137,7 +137,7 @@ def test_manual_competition_creation(self):
         self.find('div[selenium="add-column"]').click()
         sleep(LONG_WAIT)
         self.find('input[selenium="column-key"]').send_keys('cOlUmN kEy')
-        self.find('input[selenium="column-precision"]').send_keys('cOlUmN pReCiSiOn')
+        self.find('input[selenium="column-precision"]').send_keys('3')
         self.find('input[selenium="hidden"]').click()
         self.find('div[selenium="save3"]').click()
         sleep(LONG_WAIT)