diff --git a/src/ui_ng/lib/src/replication/replication.component.html.ts b/src/ui_ng/lib/src/replication/replication.component.html.ts
index e37406d78..9c8f4984c 100644
--- a/src/ui_ng/lib/src/replication/replication.component.html.ts
+++ b/src/ui_ng/lib/src/replication/replication.component.html.ts
@@ -3,7 +3,7 @@ export const REPLICATION_TEMPLATE: string = `
   <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
     <div class="row flex-items-xs-between">
       <div class="flex-xs-middle option-left">
-        <button *ngIf="withReplicationJob" class="btn btn-link" (click)="openModal()"><clr-icon shape="add"></clr-icon> {{'REPLICATION.REPLICATION_RULE' | translate}}</button>
+        <button *ngIf="projectId" class="btn btn-link" (click)="openModal()"><clr-icon shape="add"></clr-icon> {{'REPLICATION.REPLICATION_RULE' | translate}}</button>
         <create-edit-rule [projectId]="projectId" (reload)="reloadRules($event)"></create-edit-rule>
       </div>
       <div class="flex-xs-middle option-right">
diff --git a/src/ui_ng/lib/src/replication/replication.component.ts b/src/ui_ng/lib/src/replication/replication.component.ts
index e09447d64..06f42e638 100644
--- a/src/ui_ng/lib/src/replication/replication.component.ts
+++ b/src/ui_ng/lib/src/replication/replication.component.ts
@@ -114,9 +114,6 @@ export class ReplicationComponent implements OnInit {
    }
 
    ngOnInit() {
-     if(!this.projectId) {
-       this.errorHandler.warning('Project ID is unset.');
-     }
      this.currentRuleStatus = this.ruleStatus[0];
      this.currentJobStatus  = this.jobStatus[0];
      this.currentJobSearchOption = 0;
diff --git a/src/ui_ng/lib/src/repository-stackview/repository-stackview.component.css.ts b/src/ui_ng/lib/src/repository-stackview/repository-stackview.component.css.ts
index b9a0b8086..fdbaab321 100644
--- a/src/ui_ng/lib/src/repository-stackview/repository-stackview.component.css.ts
+++ b/src/ui_ng/lib/src/repository-stackview/repository-stackview.component.css.ts
@@ -1,7 +1,6 @@
 export const REPOSITORY_STACKVIEW_STYLES: string = `
 .option-right {
   padding-right: 16px;
-  margin-top: 32px;
   margin-bottom: 12px;
 }
 
diff --git a/src/ui_ng/lib/src/repository/repository.component.css.ts b/src/ui_ng/lib/src/repository/repository.component.css.ts
index fca99e94a..f443c6a1b 100644
--- a/src/ui_ng/lib/src/repository/repository.component.css.ts
+++ b/src/ui_ng/lib/src/repository/repository.component.css.ts
@@ -1,5 +1,4 @@
 export const REPOSITORY_STYLE = `.option-right {
   padding-right: 16px;
-  margin-top: 32px;
   margin-bottom: 12px;
 }`;
\ No newline at end of file