diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.scss b/demo-shell-ng2/app/components/activiti/activiti-demo.component.scss
index fa71cf7242..3b297a204a 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.scss
+++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.scss
@@ -3,8 +3,6 @@
     text-align: center;
     font-weight: 600;
     font-size: 18px;
-    font-family: Muli;
-    padding: 16px;
 }
 
 .activiti-demo-grid {
diff --git a/demo-shell-ng2/app/components/activiti/activiti-process-attachments.component.html b/demo-shell-ng2/app/components/activiti/activiti-process-attachments.component.html
index 2fe07f5a1c..c4f36017e6 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-process-attachments.component.html
+++ b/demo-shell-ng2/app/components/activiti/activiti-process-attachments.component.html
@@ -12,6 +12,7 @@
         </adf-upload-drag-area>
 
         <adf-create-process-attachment
+            *ngIf="isRunning()"
             [processInstanceId]="processId"
             (success)="onFileUploadComplete($event)">
         </adf-create-process-attachment>
diff --git a/demo-shell-ng2/app/components/activiti/activiti-process-attachments.component.ts b/demo-shell-ng2/app/components/activiti/activiti-process-attachments.component.ts
index 0c317b6b9a..d6e31cab33 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-process-attachments.component.ts
+++ b/demo-shell-ng2/app/components/activiti/activiti-process-attachments.component.ts
@@ -15,8 +15,9 @@
  * limitations under the License.
  */
 
-import { Component, Input, OnInit, ViewChild } from '@angular/core';
+import { Component, Input, OnChanges, OnInit, ViewChild } from '@angular/core';
 import { ProcessAttachmentListComponent, ProcessUploadService } from 'ng2-activiti-processlist';
+import { ProcessInstance, ProcessService } from 'ng2-activiti-processlist';
 import { UploadService } from 'ng2-alfresco-core';
 
 @Component({
@@ -24,11 +25,11 @@ import { UploadService } from 'ng2-alfresco-core';
     templateUrl: './activiti-process-attachments.component.html',
     styleUrls: ['./activiti-process-attachments.component.css'],
     providers: [
-        { provide: UploadService, useClass: ProcessUploadService }
+        {provide: UploadService, useClass: ProcessUploadService}
     ]
 })
 
-export class ActivitiProcessAttachmentsComponent implements OnInit {
+export class ActivitiProcessAttachmentsComponent implements OnInit, OnChanges {
 
     @Input()
     processId: string;
@@ -39,15 +40,23 @@ export class ActivitiProcessAttachmentsComponent implements OnInit {
     fileShowed: boolean = false;
     content: Blob;
     contentName: string;
+    processInstance: ProcessInstance;
 
-    constructor(private uploadService: UploadService) {
-
+    constructor(private uploadService: UploadService, private processService: ProcessService) {
     }
 
     ngOnInit() {
         this.uploadService.fileUploadComplete.subscribe(value => this.onFileUploadComplete(value.data));
     }
 
+    ngOnChanges() {
+        if (this.processId) {
+            this.processService.getProcess(this.processId).subscribe((processInstance: ProcessInstance) => {
+                this.processInstance = processInstance;
+            });
+        }
+    }
+
     onFileUploadComplete(content: any) {
         this.processAttachList.add(content);
     }
@@ -58,4 +67,8 @@ export class ActivitiProcessAttachmentsComponent implements OnInit {
         this.contentName = content.name;
     }
 
+    isRunning(): boolean {
+        return this.processInstance && !this.processInstance.ended;
+    }
+
 }
diff --git a/ng2-components/ng2-activiti-processlist/src/components/create-process-attachment.component.html b/ng2-components/ng2-activiti-processlist/src/components/create-process-attachment.component.html
index 7489a6d123..b8ef77fd38 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/create-process-attachment.component.html
+++ b/ng2-components/ng2-activiti-processlist/src/components/create-process-attachment.component.html
@@ -1,5 +1,6 @@
 <button
     id="add_new_process_content_button"
+    color="primary"
     md-button
     md-raised-button
     md-icon-button
diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.html b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.html
index bc7ef66e9b..588a1998aa 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.html
+++ b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.html
@@ -1,5 +1,6 @@
 <adf-datatable [rows]="attachments" [actions]="true" [loading]="isLoading" (rowDblClick)="openContent($event)" (showRowActionsMenu)="onShowRowActionsMenu($event)"
     (executeRowAction)="onExecuteRowAction($event)">
+
     <adf-empty-list *ngIf="isEmpty()">
         <div adf-empty-list-header class="adf-empty-list-header"> {{'PROCESS-ATTACHMENT.EMPTY.HEADER' | translate}} </div>
         <div adf-empty-list-body *ngIf="!isDisabled()">
@@ -10,11 +11,13 @@
             <img class="adf-empty-list__empty_doc_lib" [src]="emptyListImageUrl">
         </div>
     </adf-empty-list>
+
     <data-columns>
         <data-column key="icon" type="icon" srTitle="Thumbnail" [sortable]="false"></data-column>
         <data-column key="name" type="text" title="Name" class="full-width ellipsis-cell" [sortable]="true"></data-column>
         <data-column key="created" type="date" format="shortDate" title="Created On"></data-column>
     </data-columns>
+
     <loading-content-template>
         <ng-template>
             <!--Add your custom loading template here-->
@@ -22,4 +25,5 @@
             </md-progress-spinner>
         </ng-template>
     </loading-content-template>
-</adf-datatable>
\ No newline at end of file
+
+</adf-datatable>
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/create-task-attachment.component.html b/ng2-components/ng2-activiti-tasklist/src/components/create-task-attachment.component.html
index fff3cf9d60..618f92d2cf 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/create-task-attachment.component.html
+++ b/ng2-components/ng2-activiti-tasklist/src/components/create-task-attachment.component.html
@@ -1,4 +1,5 @@
 <button
+    color="primary"
     md-button
     md-raised-button
     md-icon-button