diff --git a/src/portal/lib/src/create-edit-rule/create-edit-rule.component.html b/src/portal/lib/src/create-edit-rule/create-edit-rule.component.html
index 7ea13cf34..b99d9ca75 100644
--- a/src/portal/lib/src/create-edit-rule/create-edit-rule.component.html
+++ b/src/portal/lib/src/create-edit-rule/create-edit-rule.component.html
@@ -88,24 +88,26 @@
               </select>
             </div>
           </div>
-          <label *ngIf="noEndpointInfo.length != 0" class="colorRed alertLabel">{{noEndpointInfo | translate}}</label>
-          <span class="alertLabel goLink" *ngIf="noEndpointInfo.length != 0" (click)="goRegistry()">{{'REPLICATION.ENDPOINTS' | translate}}</span>
+          <div>
+            <label *ngIf="noEndpointInfo.length != 0" class="colorRed alertLabel">{{noEndpointInfo | translate}}</label>
+            <span class="alertLabel goLink" *ngIf="noEndpointInfo.length != 0" (click)="goRegistry()">{{'REPLICATION.ENDPOINTS' | translate}}</span>
+          </div>
         </div>
 
         <!--Trigger-->
         <div class="form-group form-group-override">
           <label class="form-group-label-override">{{'REPLICATION.TRIGGER_MODE' | translate}}</label>
           <div formGroupName="trigger">
-            <!--on trigger-->
-            <div class="select floatSetPar">
-              <select id="ruleTrigger" formControlName="kind" (change)="selectTrigger($event)">
-                <option value="Manual">{{'REPLICATION.MANUAL' | translate}}</option>
-                <option value="Immediate">{{'REPLICATION.IMMEDIATE' | translate}}</option>
-                <option value="Scheduled">{{'REPLICATION.SCHEDULE' | translate}}</option>
-              </select>
-            </div>
             <!--on push-->
             <div formGroupName="schedule_param">
+              <!--on trigger-->
+              <div class="select floatSetPar">
+                <select id="ruleTrigger" formControlName="kind" (change)="selectTrigger($event)">
+                  <option value="Manual">{{'REPLICATION.MANUAL' | translate}}</option>
+                  <option value="Immediate">{{'REPLICATION.IMMEDIATE' | translate}}</option>
+                  <option value="Scheduled">{{'REPLICATION.SCHEDULE' | translate}}</option>
+                </select>
+              </div>
               <div class="select floatSet" [hidden]="!isScheduleOpt">
                 <select name="scheduleType" formControlName="type" (change)="selectSchedule($event)">
                   <option value="Daily">{{'REPLICATION.DAILY' | translate}}</option>
diff --git a/src/portal/lib/src/create-edit-rule/create-edit-rule.component.scss b/src/portal/lib/src/create-edit-rule/create-edit-rule.component.scss
index 98326fad0..3951dc019 100644
--- a/src/portal/lib/src/create-edit-rule/create-edit-rule.component.scss
+++ b/src/portal/lib/src/create-edit-rule/create-edit-rule.component.scss
@@ -28,7 +28,6 @@ h4 {
 }
 
 .alertLabel {
-    display: block;
     margin-top: 2px;
     line-height: 1em;
     font-size: 12px;
@@ -155,6 +154,7 @@ h4 {
     border-bottom: 1px solid blue;
     line-height: 14px;
     cursor: pointer;
+    margin-left: 12px;
 }
 
 .arrowSet{
@@ -167,7 +167,7 @@ h4 {
 
 clr-modal {
     ::ng-deep div.modal-dialog {
-        width: 25rem;
+        width: 29rem;
     }
 }