diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less
index 93ac6b76e7..a5dfd000c9 100644
--- a/awx/ui/client/legacy-styles/forms.less
+++ b/awx/ui/client/legacy-styles/forms.less
@@ -217,6 +217,7 @@
     border-radius: 5px;
     border:1px solid @field-border;
     color: @field-input-text;
+    width:100%
 }
 
 .ui-spinner-input{
diff --git a/awx/ui/client/src/notifications/edit/edit.controller.js b/awx/ui/client/src/notifications/edit/edit.controller.js
index 62ce4c4993..22dfd4f21e 100644
--- a/awx/ui/client/src/notifications/edit/edit.controller.js
+++ b/awx/ui/client/src/notifications/edit/edit.controller.js
@@ -81,7 +81,7 @@ export default
 
                             master.notification_type = $scope.notification_type;
                             CreateSelect2({
-                                element: '#notification_template_notification_typex',
+                                element: '#notification_template_notification_type',
                                 multiple: false
                             });
                             NotificationsTypeChange.getDetailFields($scope.notification_type.value).forEach(function(field) {
diff --git a/awx/ui/client/src/notifications/notificationTemplates.form.js b/awx/ui/client/src/notifications/notificationTemplates.form.js
index 89abfb36a4..579e0189a8 100644
--- a/awx/ui/client/src/notifications/notificationTemplates.form.js
+++ b/awx/ui/client/src/notifications/notificationTemplates.form.js
@@ -66,12 +66,7 @@ export default function() {
                 ngShow: "notification_type.value == 'email' ",
                 subForm: 'typeSubForm'
             },
-            use_tls: {
-                label: 'Use TLS',
-                type: 'checkbox',
-                ngShow: "notification_type.value == 'email' ",
-                subForm: 'typeSubForm'
-            },
+
             host: {
                 label: 'Host',
                 type: 'text',
@@ -119,12 +114,6 @@ export default function() {
                 ngShow: "notification_type.value == 'email' || notification_type.value == 'irc' ",
                 subForm: 'typeSubForm'
             },
-            use_ssl: {
-                labelBind: 'sslLabel',
-                type: 'checkbox',
-                ngShow: "notification_type.value == 'email' || notification_type.value == 'irc' ",
-                subForm: 'typeSubForm'
-            },
             port: {
                 labelBind: 'portLabel',
                 type: 'number',
@@ -325,7 +314,8 @@ export default function() {
             },
             targets: {
                 label: 'Destination Channels or Users',
-                type: 'text',
+                type: 'textarea',
+                rows: 3,
                 awPopOver: '<p>Type an option on each line. The pound symbol (#) is not required.</p>'+
                             '<p>For example:<br>#support or support<br>\n @username or username<br>\n',
                 dataTitle: 'Destination Channels',
@@ -338,6 +328,18 @@ export default function() {
                 ngShow: "notification_type.value == 'irc' ",
                 subForm: 'typeSubForm'
             },
+            use_tls: {
+                label: 'Use TLS',
+                type: 'checkbox',
+                ngShow: "notification_type.value == 'email' ",
+                subForm: 'typeSubForm'
+            },
+            use_ssl: {
+                labelBind: 'sslLabel',
+                type: 'checkbox',
+                ngShow: "notification_type.value == 'email' || notification_type.value == 'irc' ",
+                subForm: 'typeSubForm'
+            },
 
         },