diff --git a/frontend/src/css/modules/submission.scss b/frontend/src/css/modules/submission.scss
index 957800cc48..a6384156c5 100644
--- a/frontend/src/css/modules/submission.scss
+++ b/frontend/src/css/modules/submission.scss
@@ -117,3 +117,8 @@ md-radio-button .md-on {
 	flex-direction: row;
 	align-items: center;
 }
+
+.btn-custom {
+	padding: 0 1rem;
+	font-size: 0.8rem;
+}
diff --git a/frontend/src/js/controllers/challengeCtrl.js b/frontend/src/js/controllers/challengeCtrl.js
index 6a02c36c0c..3a035519aa 100644
--- a/frontend/src/js/controllers/challengeCtrl.js
+++ b/frontend/src/js/controllers/challengeCtrl.js
@@ -3025,8 +3025,11 @@
                         var status = response.status;
                         if (status === 200) {
                             $rootScope.notify("success", "You have successfully deregistered from the challenge.");
+                            $mdDialog.hide();
                             $state.go('web.challenge-main.challenge-page.overview');
+                            setTimeout(function() {
                             $state.reload();
+                            }, 100);
                         }
                     },
                     onError: function(response) {
diff --git a/frontend/src/js/route-config/route-config.js b/frontend/src/js/route-config/route-config.js
index 5f7b07729f..66dec96c83 100644
--- a/frontend/src/js/route-config/route-config.js
+++ b/frontend/src/js/route-config/route-config.js
@@ -239,7 +239,28 @@
             url: "/submission",
             templateUrl: baseUrl + "/web/challenge/submission.html",
             title: 'Submit',
-            authenticate: true
+            authenticate: true,
+            resolve: {
+                challenge: function(utilities, $state, $stateParams) {
+                  return new Promise(function(resolve) {
+                    var parameters = {};
+                    parameters.token = utilities.getData('userKey');
+                    parameters.url = 'challenges/' + $stateParams.challengeId + '/participant_team/team_detail';
+                    parameters.method = 'GET';
+                    parameters.data = {};
+                    parameters.callback = {
+                        onSuccess: function(response) {
+                            var details = response.data;
+                            resolve(details);
+                        },
+                      onError: function() {
+                        $state.go('error-404');
+                      }
+                    };
+                    utilities.sendRequest(parameters);
+                  });
+                }
+              },
         };
 
         var my_submission = {
diff --git a/frontend/src/views/web/challenge/edit-challenge/edit-challenge-deregister.html b/frontend/src/views/web/challenge/edit-challenge/edit-challenge-deregister.html
index d599b88b98..017b9cbb8c 100644
--- a/frontend/src/views/web/challenge/edit-challenge/edit-challenge-deregister.html
+++ b/frontend/src/views/web/challenge/edit-challenge/edit-challenge-deregister.html
@@ -5,7 +5,7 @@
                 <form name="Deregisterform" ng-submit="challenge.deregister(Deregisterform.$valid)">
                     <div class="pass-title">Deregister Partipant Team</div>
                     <div class="input-field align-left">
-                        <span class="form-icon"> Are you sure you want to deregister Team: <b>{{challenge.participated_team_name}} </b>?<i class="fa fa-text"></i></span>
+                        <span class="form-icon"> Are you sure you want to deregister team: <b>{{challenge.participated_team_name}} </b>?<i class="fa fa-text"></i></span>
                       </div>
                       <ul class="inline-list pointer">
                         <li>
diff --git a/frontend/src/views/web/challenge/submission.html b/frontend/src/views/web/challenge/submission.html
index b660680aba..4011b7c65a 100644
--- a/frontend/src/views/web/challenge/submission.html
+++ b/frontend/src/views/web/challenge/submission.html
@@ -30,7 +30,7 @@ <h5 class="w-300">Submission Guidelines</h5>
 <section ng-if="!challenge.isChallengeHost" class="ev-sm-container ev-view challenge-container">
     <div class="ev-md-container ev-card-panel ev-z-depth-5">
         Click here to deregister from this challenge:
-        <button class="btn ev-btn-dark waves-effect waves-dark grad-btn grad-btn-dark fs-16" ng-click="challenge.deregisterdialog($event)">Deregister</button>
+        <button class="btn btn-custom ev-btn-dark waves-effect waves-dark grad-btn grad-btn-dark fs-16" ng-click="challenge.deregisterdialog($event)">Deregister</button>
     </div>
 </section>