diff --git a/docker-compose.yml b/docker-compose.yml
index b80180df5..5fa877733 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -114,6 +114,7 @@ services:
     environment:
       - PGDATA=/var/lib/postgresql/data/pgdata
       - POSTGRES_PASSWORD=${DB_PASSWORD}
+    command: ["postgres", "-c", "log_statement=all", "-c", "log_destination=stderr"]
     ports:
       - 5432:5432
     volumes:
diff --git a/src/apps/api/serializers/submission_leaderboard.py b/src/apps/api/serializers/submission_leaderboard.py
index f4d9594af..368f8fec4 100644
--- a/src/apps/api/serializers/submission_leaderboard.py
+++ b/src/apps/api/serializers/submission_leaderboard.py
@@ -20,7 +20,7 @@ class SubmissionLeaderBoardSerializer(serializers.ModelSerializer):
     display_name = serializers.CharField(source='owner.display_name')
     slug_url = serializers.CharField(source='owner.slug_url')
     organization = SimpleOrganizationSerializer(allow_null=True)
-    created_when = serializers.DateTimeField(format="%Y-%m-%d %H:%M")
+    created_when = serializers.DateTimeField()
 
     class Meta:
         model = Submission
diff --git a/src/apps/api/serializers/submissions.py b/src/apps/api/serializers/submissions.py
index 1f31fe2c3..5511c027e 100644
--- a/src/apps/api/serializers/submissions.py
+++ b/src/apps/api/serializers/submissions.py
@@ -26,7 +26,7 @@ class SubmissionSerializer(serializers.ModelSerializer):
     phase_name = serializers.CharField(source='phase.name')
     on_leaderboard = serializers.BooleanField(read_only=True)
     task = TaskSerializer()
-    created_when = serializers.DateTimeField(format="%Y-%m-%d %H:%M")
+    created_when = serializers.DateTimeField()
     auto_run = serializers.SerializerMethodField(read_only=True)
     can_make_submissions_public = serializers.SerializerMethodField(read_only=True)
 
diff --git a/src/apps/api/views/analytics.py b/src/apps/api/views/analytics.py
index 01b477748..c102135cb 100644
--- a/src/apps/api/views/analytics.py
+++ b/src/apps/api/views/analytics.py
@@ -221,6 +221,7 @@ def competitions_usage(request):
 
         query = CompetitionStorageDataPoint.objects.filter(
             at_date__range=(start_date, end_date),
+            competition__isnull=False
         ).dates("at_date", resolution).values(
             'id',
             'competition__id',
@@ -267,6 +268,7 @@ def users_usage(request):
 
         query = UserStorageDataPoint.objects.filter(
             at_date__range=(start_date, end_date),
+            user__isnull=False
         ).dates("at_date", resolution).values(
             'id',
             'user__id',
diff --git a/src/apps/api/views/competitions.py b/src/apps/api/views/competitions.py
index 02f0590c9..c34eec48e 100644
--- a/src/apps/api/views/competitions.py
+++ b/src/apps/api/views/competitions.py
@@ -34,7 +34,6 @@
 from leaderboards.models import Leaderboard
 from utils.data import make_url_sassy
 from api.permissions import IsOrganizerOrCollaborator
-from datetime import datetime
 from django.db import transaction
 from django.conf import settings
 
@@ -271,8 +270,8 @@ def update(self, request, *args, **kwargs):
                         new_phase_obj = Phase.objects.create(
                             status=phase["status"],
                             index=phase["index"],
-                            start=datetime.strptime(phase['start'], "%B %d, %Y"),
-                            end=datetime.strptime(phase['end'], "%B %d, %Y") if phase['end'] else None,
+                            start=phase['start'],
+                            end=phase['end'] if phase['end'] else None,
                             name=phase["name"],
                             description=phase["description"],
                             hide_output=phase["hide_output"],
@@ -706,15 +705,15 @@ def get_leaderboard(self, request, pk):
             # - child submissions (submissions who has a parent i.e. parent field is not null)
             # - Failed submissions
             # - Cancelled submissions
-            num_entries = Submission.objects.filter(
-                Q(owner__username=submission['owner']) |
-                Q(parent__owner__username=submission['owner']),
-                phase=phase,
-            ).exclude(
-                Q(status=Submission.FAILED) |
-                Q(status=Submission.CANCELLED) |
-                Q(parent__isnull=False)
-            ).count()
+            # num_entries = Submission.objects.filter(
+            #     Q(owner__username=submission['owner']) |
+            #     Q(parent__owner__username=submission['owner']),
+            #     phase=phase,
+            # ).exclude(
+            #     Q(status=Submission.FAILED) |
+            #     Q(status=Submission.CANCELLED) |
+            #     Q(parent__isnull=False)
+            # ).count()
 
             submission_key = f"{submission['owner']}{submission['parent'] or submission['id']}"
 
@@ -738,7 +737,7 @@ def get_leaderboard(self, request, pk):
                     'fact_sheet_answers': submission['fact_sheet_answers'],
                     'slug_url': submission['slug_url'],
                     'organization': submission['organization'],
-                    'num_entries': num_entries,
+                    # 'num_entries': num_entries,
                     'created_when': submission['created_when']
                 })
             for score in submission['scores']:
diff --git a/src/static/riot/competitions/detail/_tabs.tag b/src/static/riot/competitions/detail/_tabs.tag
index b21f1aac1..0d3d649ec 100644
--- a/src/static/riot/competitions/detail/_tabs.tag
+++ b/src/static/riot/competitions/detail/_tabs.tag
@@ -412,7 +412,7 @@
         })
 
         self.pretty_date = function (date_string) {
-            if (!!date_string) {
+            if (date_string != null) {
                 return luxon.DateTime.fromISO(date_string).toLocaleString(luxon.DateTime.DATETIME_FULL)
             } else {
                 return ''
diff --git a/src/static/riot/competitions/detail/leaderboards.tag b/src/static/riot/competitions/detail/leaderboards.tag
index 7ddef46ea..25cc1e99a 100644
--- a/src/static/riot/competitions/detail/leaderboards.tag
+++ b/src/static/riot/competitions/detail/leaderboards.tag
@@ -34,7 +34,6 @@
         <tr>
             <th class="center aligned">#</th>
             <th>Participant</th>
-            <th>Entries</th>
             <th>Date</th>
             <th>ID</th>
             <th each="{ column in filtered_columns }" colspan="1">{column.title}</th>
@@ -83,8 +82,7 @@
             </td>
             <td if="{submission.organization === null}"><a href="{submission.slug_url}">{ submission.owner }</a></td>
             <td if="{submission.organization !== null}"><a href="{submission.organization.url}">{ submission.organization.name }</a></td>
-            <td>{submission.num_entries}</td>
-            <td>{submission.created_when}</td>
+            <td>{ pretty_date(submission.created_when) }</td>
             <td>{submission.id}</td>
             <td each="{ column in filtered_columns }">
                 <a if="{column.title == 'Detailed Results'}" href="detailed_results/{get_detailed_result_submisison_id(column, submission)}" target="_blank" class="eye-icon-link">
@@ -108,6 +106,13 @@
         self.enable_detailed_results = false
         self.show_detailed_results_in_leaderboard = false
 
+        self.pretty_date = function (date_string) {
+            if (!!date_string) {
+                return luxon.DateTime.fromISO(date_string).toFormat('yyyy-MM-dd HH:mm')
+            } else {
+                return ''
+            }
+        }
        
         self.bold_class = function(column, submission){
             // Return `text-bold` if submission has 
diff --git a/src/static/riot/competitions/detail/submission_manager.tag b/src/static/riot/competitions/detail/submission_manager.tag
index 0f76b320b..e714718d8 100644
--- a/src/static/riot/competitions/detail/submission_manager.tag
+++ b/src/static/riot/competitions/detail/submission_manager.tag
@@ -89,7 +89,7 @@
                 <td>{ submission.filename }</td>
                 <td if="{ opts.admin }">{ submission.owner }</td>
                 <td if="{ opts.admin }">{ submission.phase.name }</td>
-                <td>{ submission.created_when}</td>
+                <td>{ pretty_date(submission.created_when) }</td>
                 <td class="right aligned collapsing">
                     { submission.status }
                     <sup data-tooltip="{submission.status_details}">
@@ -201,6 +201,8 @@
     <script>
         var self = this
 
+        
+
         self.selected_phase = undefined
         self.selected_submission = undefined
         self.hide_output = false
@@ -217,6 +219,14 @@
             $(self.refs.submission_table).tablesort()
         })
 
+        self.pretty_date = function (date_string) {
+            if (!!date_string) {
+                return luxon.DateTime.fromISO(date_string).toFormat('yyyy-MM-dd HH:mm')
+            } else {
+                return ''
+            }
+        }
+
         self.is_admin = () => {
             return _.get(self.selected_submission, 'admin', false)
         }
@@ -607,4 +617,4 @@
         .failed.question.circle.icon
             color #2c3f4c
     </style>
-</submission-manager>
\ No newline at end of file
+</submission-manager>
diff --git a/src/static/riot/competitions/editor/_phases.tag b/src/static/riot/competitions/editor/_phases.tag
index e7d5a98fe..fd0e09cd5 100644
--- a/src/static/riot/competitions/editor/_phases.tag
+++ b/src/static/riot/competitions/editor/_phases.tag
@@ -59,7 +59,8 @@
     <div class="ui large modal" ref="modal">
         <i class="close icon"></i>
         <div class="header">
-            Edit phase
+            <!--  When no phase is selected selected_phase_index is undefined  -->
+            { typeof selected_phase_index === 'undefined' ?  'Add Phase' : 'Edit Phase' }
         </div>
         <div class="content">
             <form selenium="phase-form" class="ui form" ref="form">
@@ -68,20 +69,46 @@
                     <input name="name">
                 </div>
 
+                <!--  Start Date and Time  -->
                 <div class="two fields">
-                    <div class="ui calendar field required" ref="calendar_start">
-                        <label>Start</label>
+                    <div class="ui calendar field required" ref="calendar_start_date">
+                        <label>Start Date</label>
                         <div class="ui input left icon">
                             <i class="calendar icon"></i>
-                            <input type="text" name="start">
+                            <input type="text" name="start_date">
                         </div>
                     </div>
+                    <div class="ui calendar field required" ref="calendar_start_time">
+                        <label>Start Time
+                        <span data-tooltip="Select time in UTC+0 time zone" data-inverted=""
+                              data-position="bottom center"><i class="help icon circle"></i></span>
+                        </label> 
+                        
+                        <div class="ui input left icon">
+                            <i class="clock icon"></i>
+                            <input type="text" name="start_time">
+                        </div>
+                    </div>
+                </div>
 
-                    <div class="ui calendar field" ref="calendar_end">
-                        <label>End</label>
+                <!--  End Date and Time  -->
+                <div class="two fields">
+                    <div class="ui calendar field" ref="calendar_end_date">
+                        <label>End Date</label>
                         <div class="ui input left icon">
                             <i class="calendar icon"></i>
-                            <input type="text" name="end">
+                            <input type="text" name="end_date">
+                        </div>
+                    </div>
+
+                    <div class="ui calendar field" ref="calendar_end_time">
+                        <label>End Time
+                        <span data-tooltip="Select time in UTC+0 time zone" data-inverted=""
+                              data-position="bottom center"><i class="help icon circle"></i></span>
+                        </label>
+                        <div class="ui input left icon">
+                            <i class="clock icon"></i>
+                            <input type="text" name="end_time">
                         </div>
                     </div>
                 </div>
@@ -363,7 +390,9 @@
 
             // Have to initialize calendars here (instead of on mount) because they don't exist yet
             if (!self.has_initialized_calendars) {
-                var datetime_options = {
+
+                // Initialize date calendars options
+                var date_options = {
                     type: 'date',
                     popupOptions: {
                         position: 'bottom left',
@@ -376,17 +405,60 @@
                     }
                 }
 
-                var start_options = Object.assign({}, datetime_options, {endCalendar: self.refs.calendar_end})
-                var end_options = Object.assign({}, datetime_options, {startCalendar: self.refs.calendar_start})
+                // Initialize time calendars options
+                var time_options = {
+                    type: 'time',
+                    popupOptions: {
+                        position: 'bottom left',
+                        lastResort: 'bottom left',
+                        hideOnScroll: false
+                    },
+                    ampm: false,
+                    onHide: function () {
+                        // Have to do this because onchange isn't fired when date is picked
+                        self.form_updated()
+                    }
+                }
+
+                // Create a new options object for the start date calendar by combining 'date_options'
+                // with an additional option to link the end date calendar. This ensures that the start date
+                // cannot be after the selected end date.
+                var start_options = Object.assign({}, date_options, {endCalendar: self.refs.calendar_end_date})
+                
+                // Similarly, create a new options object for the end date calendar, linking it to the start date.
+                // This ensures that the end date cannot be before the selected start date.
+                var end_options = Object.assign({}, date_options, {startCalendar: self.refs.calendar_start_date})
+                
+                // Initialize the start date calendar using the options defined above, including the end date limitation.
+                $(self.refs.calendar_start_date).calendar(start_options)
+
+                // Initialize the end date calendar using the options defined above, which includes the start date limitation.
+                $(self.refs.calendar_end_date).calendar(end_options)
+
+
+
+                // Initialize the start time calendar with the defined options. 
+                // This will create a time picker for the 'start time' field.
+                $(self.refs.calendar_start_time).calendar(time_options)
 
-                $(self.refs.calendar_start).calendar(start_options)
-                $(self.refs.calendar_end).calendar(end_options)
+                // Initialize the end time calendar with the same time picker options.
+                // This will create a time picker for the 'end time' field.
+                $(self.refs.calendar_end_time).calendar(time_options)
 
                 self.has_initialized_calendars = true
             }
+
+            // This condition is executed when selected_phase_index is not undefined i.e. a phase is selected
+            // This means that user is updating a phase and is not creating a new phase
             if(!(self.selected_phase_index === undefined)){
-                $(self.refs.calendar_start).calendar('set date', self.phases[self.selected_phase_index].start)
-                $(self.refs.calendar_end).calendar('set date', self.phases[self.selected_phase_index].end)
+                
+                // Set Dates
+                $(self.refs.calendar_start_date).calendar('set date', self.getDate(self.phases[self.selected_phase_index].start))
+                $(self.refs.calendar_end_date).calendar('set date', self.getDate(self.phases[self.selected_phase_index].end))
+
+                // Set times
+                $(self.refs.calendar_start_time).calendar('set date', self.getTime(self.phases[self.selected_phase_index].start))
+                $(self.refs.calendar_end_time).calendar('set date', self.getTime(self.phases[self.selected_phase_index].end))
             }
         }
 
@@ -412,6 +484,57 @@
             }
             return input
         }
+        self.getDate = function(dt) {
+            // function for extracting date only from the start or end date of a phase
+            // format: 'YYYY-MM-DD'
+            if (dt != null){
+                dt = new Date(dt)
+                return dt.toISOString().split('T')[0]
+            }else{
+                return ""
+            }
+        }
+        self.getTime = function(dt) {
+            // function for extracting time only from the start or end date of a phase
+            // format: 'HH:MM' 24-hour format in UTC
+            if (dt != null){
+                dt = new Date(dt)
+                return dt.toLocaleTimeString('en-GB', { 
+                    hour: '2-digit', 
+                    minute: '2-digit',
+                    timeZone: 'UTC' // Set time zone to UTC
+                })
+            }else{
+                return ""
+            }
+        }
+        self.formatDateTo_Y_m_d_T_H_M_S = function(input) {
+            // This function formats date in the format YYYY-MM-DDTHH:MM:SS
+
+            // Convert input to date
+            var dateObject = new Date(input)
+
+            // Check if date is valid
+            if (!isNaN(dateObject.getTime())) {
+                // Extract year
+                var year = dateObject.getFullYear()
+                // Extract month
+                var month = (dateObject.getMonth() + 1).toString().padStart(2, '0') // Months are zero-based
+                // Extract day
+                var day = dateObject.getDate().toString().padStart(2, '0')
+                // Extract hours
+                var hours = dateObject.getHours().toString().padStart(2, '0')
+                // Extract minutes
+                var minutes = dateObject.getMinutes().toString().padStart(2, '0')
+                // Extract seconds
+                var seconds = dateObject.getSeconds().toString().padStart(2, '0')
+                
+                // Return formatted date string
+                return year + '-' + month + '-' + day + 'T' + hours + ':' + minutes + ':' + seconds
+            }
+            return input
+        }
+
 
         self.form_updated = function () {
             // This checks phases overall to make sure they are ready to go
@@ -467,7 +590,9 @@
         self.form_check_is_valid = function () {
             // This checks our current form to make sure it's valid
             var data = get_form_data(self.refs.form)
-            self.form_is_valid = !!data.name && !!data.start && self.phase_tasks.length > 0
+            // Phase add/update form is valid if it has 
+            // name, start_date, start_time, and at least one task
+            self.form_is_valid = !!data.name && !!data.start_date && !!data.start_time && self.phase_tasks.length > 0
         }
 
         self.clear_form = function () {
@@ -485,6 +610,20 @@
             })
             $(self.refs.auto_migrate).prop('checked', false)
 
+            // Clear date and time fields values
+            $(self.refs.calendar_start_date).find('input[name="start_date"]').val('')
+            $(self.refs.calendar_start_time).find('input[name="start_time"]').val('')
+            $(self.refs.calendar_end_date).find('input[name="end_date"]').val('')
+            $(self.refs.calendar_end_time).find('input[name="end_time"]').val('')
+
+            // Clear the date fields calendars
+            // This will make sure that when you click add new phase, the date and time pickers
+            // will not show other phase date/time preselected in the date and time pickers
+            $(self.refs.calendar_start_date).calendar('clear');
+            $(self.refs.calendar_end_date).calendar('clear');
+            $(self.refs.calendar_start_time).calendar('clear');
+            $(self.refs.calendar_end_time).calendar('clear');
+
             self.simple_markdown_editor.value('')
 
             self.form_updated()
@@ -641,6 +780,26 @@
             self.phase_starting_kit = sorted_phase_starting_kit.slice()
 
             var data = get_form_data(self.refs.form)
+
+            // Fill default start time if start time is empty
+            if (data.start_time == "") {
+                data.start_time = "00:00"
+            } 
+            // Change phase start format to ISO date format "Y-m-dTH:M:S"
+            data.start = self.formatDateTo_Y_m_d_T_H_M_S(data.start_date + " " + data.start_time)
+
+            
+            if (data.end_date) {
+                // Fill default end time if end time is empty
+                if (data.end_time == "") {
+                    data.end_time = "00:00"
+                }
+                data.end = self.formatDateTo_Y_m_d_T_H_M_S(data.end_date + " " + data.end_time)
+            }else{
+                // end date is set to null if it is not selected because it is optional in the form
+                data.end = null
+            }
+
             data.tasks = self.phase_tasks
             data.public_data = self.phase_public_data.length === 0 ? null : self.phase_public_data[0]
             data.starting_kit = self.phase_starting_kit.length === 0 ? null : self.phase_starting_kit[0]
diff --git a/src/tests/functional/test_competitions.py b/src/tests/functional/test_competitions.py
index 3335afa83..fb3523007 100644
--- a/src/tests/functional/test_competitions.py
+++ b/src/tests/functional/test_competitions.py
@@ -108,11 +108,25 @@ def test_manual_competition_creation(self):
         sleep(LONG_WAIT)
         self.find('form[selenium="phase-form"] input[name="name"]').send_keys('Name')
         sleep(SHORT_WAIT)
-        self.find('input[name="start"]').click()
-        self.find('input[name="start"]').send_keys(2)
-        self.find('input[name="start"]').send_keys(Keys.ENTER)
-        self.find('input[name="end"]').send_keys(3)
-        self.find('input[name="end"]').send_keys(Keys.ENTER)
+        # Click start date field, press 2, press enter
+        self.find('input[name="start_date"]').click()
+        self.find('input[name="start_date"]').send_keys(2)
+        self.find('input[name="start_date"]').send_keys(Keys.ENTER)
+        sleep(SHORT_WAIT)
+        # Click start time field, press 2, press enter
+        self.find('input[name="start_time"]').click()
+        self.find('input[name="start_time"]').send_keys(2)
+        self.find('input[name="start_time"]').send_keys(Keys.ENTER)
+        sleep(SHORT_WAIT)
+        # Click end date field, press 3, press enter
+        self.find('input[name="end_date"]').click()
+        self.find('input[name="end_date"]').send_keys(3)
+        self.find('input[name="end_date"]').send_keys(Keys.ENTER)
+        sleep(SHORT_WAIT)
+        # Click end time field, press 2, press enter
+        self.find('input[name="end_time"]').click()
+        self.find('input[name="end_time"]').send_keys(3)
+        self.find('input[name="end_time"]').send_keys(Keys.ENTER)
         self.find('label[for="tasks"]').click()
         sleep(SHORT_WAIT)
         self.find("form[selenium='phase-form'] input.search").send_keys("Wheat")
diff --git a/src/tests/functional/test_submissions.py b/src/tests/functional/test_submissions.py
index 3ee088ae0..6248ccaf2 100644
--- a/src/tests/functional/test_submissions.py
+++ b/src/tests/functional/test_submissions.py
@@ -74,7 +74,7 @@ def _run_submission_and_add_to_leaderboard(self, competition_zip_path, submissio
 
         # The leaderboard table lists our submission
         prediction_score = Submission.objects.get(pk=submission_id).scores.first().score
-        assert Decimal(self.find('leaderboards table tbody tr:nth-of-type(1) td:nth-of-type(6)').text) == round(Decimal(prediction_score), precision)
+        assert Decimal(self.find('leaderboards table tbody tr:nth-of-type(1) td:nth-of-type(5)').text) == round(Decimal(prediction_score), precision)
 
     def test_v15_iris_result_submission_end_to_end(self):
         self._run_submission_and_add_to_leaderboard('competition_15_iris.zip', 'submission_15_iris_result.zip', '======= Set 1 (Iris_test)', has_solutions=False, precision=4)