diff --git a/base/messages.py b/base/messages.py
index 82a149b..e36921f 100644
--- a/base/messages.py
+++ b/base/messages.py
@@ -44,7 +44,7 @@ ERROR_CODE = {
     "2018": "Attached File not found",
     "2019": "Invalid Referral code",
     "2020": "Enter valid mobile number",
-    "2021": "Already register",
+    "2021": "User registered",
     "2022": "Invalid Guardian code",
     "2023": "Invalid user",
     # email not verified
diff --git a/guardian/views.py b/guardian/views.py
index 824f6ff..5e89417 100644
--- a/guardian/views.py
+++ b/guardian/views.py
@@ -149,7 +149,7 @@ class TaskListAPIView(viewsets.ModelViewSet):
     def get_queryset(self):
         queryset = JuniorTask.objects.filter(guardian__user=self.request.user
                                              ).select_related('junior', 'junior__auth'
-                                                              ).order_by('due_date', 'created_at')
+                                                              ).order_by('-created_at')
 
         queryset = self.filter_queryset(queryset)
         return queryset
diff --git a/junior/serializers.py b/junior/serializers.py
index 6b765dc..615c949 100644
--- a/junior/serializers.py
+++ b/junior/serializers.py
@@ -108,7 +108,7 @@ class CreateJuniorSerializer(serializers.ModelSerializer):
                 if guardian_data:
                     JuniorGuardianRelationship.objects.get_or_create(guardian=guardian_data, junior=junior)
                     send_notification.delay(ASSOCIATE_REQUEST, junior.auth_id, JUNIOR, guardian_data.user_id, {})
-                junior_approval_mail.delay(user.email, user.first_name)
+                # junior_approval_mail.delay(user.email, user.first_name) removed as per changes
             junior.dob = validated_data.get('dob', junior.dob)
             junior.passcode = validated_data.get('passcode', junior.passcode)
             junior.country_name = validated_data.get('country_name', junior.country_name)
@@ -466,7 +466,7 @@ class AddGuardianSerializer(serializers.ModelSerializer):
 
             """Notification email"""
             junior_notification_email(email, full_name, email, password)
-            junior_approval_mail.delay(email, full_name)
+            # junior_approval_mail.delay(email, full_name) removed as per changes
             send_notification.delay(ASSOCIATE_REQUEST, junior_data.auth_id, JUNIOR, guardian_data.user_id, {})
             return guardian_data
 
diff --git a/junior/views.py b/junior/views.py
index e6bd606..171c454 100644
--- a/junior/views.py
+++ b/junior/views.py
@@ -383,7 +383,7 @@ class JuniorTaskListAPIView(viewsets.ModelViewSet):
     def get_queryset(self):
         queryset = JuniorTask.objects.filter(junior__auth=self.request.user
                                              ).select_related('junior', 'junior__auth'
-                                                              ).order_by('due_date', 'created_at')
+                                                              ).order_by('-created_at')
 
         queryset = self.filter_queryset(queryset)
         return queryset
diff --git a/notifications/views.py b/notifications/views.py
index c3a6751..cec50e4 100644
--- a/notifications/views.py
+++ b/notifications/views.py
@@ -68,5 +68,8 @@ class NotificationViewSet(viewsets.GenericViewSet):
         """
         notification list
         """
-        Notification.objects.filter(id__in=request.data.get('id')).update(is_read=True)
+        if request.query_params.get('all'):
+            Notification.objects.filter(notification_to_id=request.auth.payload['user_id']).update(is_read=True)
+        elif request.data.get('id'):
+            Notification.objects.filter(id__in=request.data.get('id')).update(is_read=True)
         return custom_response(SUCCESS_CODE['3039'], response_status=status.HTTP_200_OK)