diff --git a/app/src/app/secondary-components/create-service/internal/create-service.component.html b/app/src/app/secondary-components/create-service/internal/create-service.component.html
index 0093beb7ed..426206047b 100644
--- a/app/src/app/secondary-components/create-service/internal/create-service.component.html
+++ b/app/src/app/secondary-components/create-service/internal/create-service.component.html
@@ -93,20 +93,20 @@ <h4 class="bold-title">
                     <div class="input-field-container">
                         <section class="col-lg-3 col-md-3 pad-left0">
                             <div class="radio-container">
-                                <input type="radio" class='test-focus' name="runtime" id="nodejs" [value]="nodejs" [checked]="runtime == 'nodejs'" (click)="onSelectionChange(runtimeKeys[0])">
-                                <label for="nodejs"><span class='outer'></span><span class="background"></span>{{runtimeObject[runtimeKeys[0]]}}</label>
+                                <input type="radio" class='test-focus' name="runtime" [id]="runtimeKeys[0]" [value]="runtimeKeys[0]" [checked]="runtime == 'runtimeKeys[0]'" (click)="onSelectionChange(runtimeKeys[0])">
+                                <label [for]="runtimeKeys[0]"><span class='outer'></span><span class="background"></span>{{runtimeObject[runtimeKeys[0]]}}</label>
                             </div>
                         </section>
                         <section class="col-lg-3 col-md-3 pad-left0">
                             <div class="radio-container">
-                                <input type="radio" name="runtime" id="java" [value]="java" [checked]="runtime == 'java'" (click)="onSelectionChange(runtimeKeys[0])">
-                                <label for="java"><span class='outer'></span><span class="background"></span>{{runtimeObject[runtimeKeys[1]]}}</label>
+                                <input type="radio" name="runtime" [id]="runtimeKeys[1]" [value]="runtimeKeys[1]" [checked]="runtime == 'runtimeKeys[1]'" (click)="onSelectionChange(runtimeKeys[1])">
+                                <label [for]="runtimeKeys[1]"><span class='outer'></span><span class="background"></span>{{runtimeObject[runtimeKeys[1]]}}</label>
                             </div>
                         </section>
                         <section class="col-lg-3 col-md-3 pad-left0">
                             <div class="radio-container">
-                                <input type="radio" name="runtime" id="python" [value]="python" [checked]="runtime == 'python'" (change)="onSelectionChange(runtimeKeys[0])">
-                                <label for="python"><span class='outer'></span><span class="background"></span>{{runtimeObject[runtimeKeys[2]]}}</label>
+                                <input type="radio" name="runtime" [id]="runtimeKeys[2]" [value]="runtimeKeys[2]" [checked]="runtime == 'runtimeKeys[2]'" (change)="onSelectionChange(runtimeKeys[2])">
+                                <label [for]="runtimeKeys[2]"><span class='outer'></span><span class="background"></span>{{runtimeObject[runtimeKeys[2]]}}</label>
                             </div>
                         </section>
                         <section class="col-lg-3 col-md-3 pad-left0">
diff --git a/app/src/app/secondary-components/create-service/internal/create-service.component.ts b/app/src/app/secondary-components/create-service/internal/create-service.component.ts
index 5ff1ed8e6b..99878e9c84 100644
--- a/app/src/app/secondary-components/create-service/internal/create-service.component.ts
+++ b/app/src/app/secondary-components/create-service/internal/create-service.component.ts
@@ -197,6 +197,7 @@ export class CreateServiceComponent implements OnInit {
 
   // function for opening and closing create service popup
   closeCreateService(serviceRequest) {
+    this.onClose.emit(false);
     if (serviceRequest) {
       this.servicelist.serviceCall();
     }
@@ -207,7 +208,6 @@ export class CreateServiceComponent implements OnInit {
     this.serviceRequestFailure = false;
     this.serviceRequestSuccess = false;
     this.approversList = this.approversListShow;
-    this.onClose.emit(false);
   }
 
 
diff --git a/app/src/environments/environment.ts b/app/src/environments/environment.ts
index 109df72163..26745edca6 100644
--- a/app/src/environments/environment.ts
+++ b/app/src/environments/environment.ts
@@ -49,7 +49,7 @@ export const environment = {
   envName: "jazz",
   multi_env: false,
   serviceTabs: ['overview', 'access control', 'metrics', 'logs'],
-  envLists : {"nodejs8.10" : "Nodejs 8.10","python2.7" : "Python 2.7", "java8" : "Java 8" },
+  envLists :  {"nodejs8.10" : "Nodejs 8.10","python2.7" : "Python 2.7", "java8" : "Java 8" },
   environmentTabs: ['overview', 'deployments', 'code quality', 'assets', 'metrics', 'logs', 'clearwater'],
   urls: {
     docs_link: "https://docs.jazz.corporate.t-mobile.com",