diff --git a/packages/presentation/src/components/Card.svelte b/packages/presentation/src/components/Card.svelte
index 5bf2da9f4f..e1c7c21b78 100644
--- a/packages/presentation/src/components/Card.svelte
+++ b/packages/presentation/src/components/Card.svelte
@@ -30,8 +30,6 @@
   export let spaceLabel: IntlString
   export let spacePlaceholder: IntlString
   export let label: IntlString
-  export let okLabel: IntlString
-  export let cancelLabel: IntlString
   export let okAction: () => void
   export let canSave: boolean = false
 
@@ -54,8 +52,8 @@
     <SpaceSelect _class={spaceClass} label={spaceLabel} placeholder={spacePlaceholder} bind:value={space} />
   </div>
   <div class="footer">
-    <Button disabled={!canSave} label={okLabel} size={'small'} transparent primary on:click={() => { okAction(); dispatch('close') }} />
-    <Button label={cancelLabel} size={'small'} transparent on:click={() => { dispatch('close') }} />
+    <Button disabled={!canSave} label={'Create'} size={'small'} transparent primary on:click={() => { okAction(); dispatch('close') }} />
+    <Button label={'Cancel'} size={'small'} transparent on:click={() => { dispatch('close') }} />
   </div>
 </form>
 
diff --git a/packages/presentation/src/components/MessageBox.svelte b/packages/presentation/src/components/MessageBox.svelte
index bb44ec939a..271d9877fc 100644
--- a/packages/presentation/src/components/MessageBox.svelte
+++ b/packages/presentation/src/components/MessageBox.svelte
@@ -28,8 +28,8 @@
   <div class="overflow-label title"><Label {label} /></div>
   <div class="message"><Label label={message} /></div>
   <div class="footer">
-    <Button label={'Ok'} size={'small'} primary on:click={() => dispatch('close', 'OK')} />
-    <Button label={'Cancel'} size={'small'} on:click={() => dispatch('close', 'CANCEL')} />
+    <Button label={'Ok'} size={'small'} primary on:click={() => dispatch('close', true)} />
+    <Button label={'Cancel'} size={'small'} on:click={() => dispatch('close', false)} />
   </div>
 </div>
 
diff --git a/plugins/recruit-resources/src/components/CreateApplication.svelte b/plugins/recruit-resources/src/components/CreateApplication.svelte
index fe63c118a9..a4ca5a9a43 100644
--- a/plugins/recruit-resources/src/components/CreateApplication.svelte
+++ b/plugins/recruit-resources/src/components/CreateApplication.svelte
@@ -43,6 +43,10 @@
   const dispatch = createEventDispatcher()
   const client = getClient()
 
+  export function canClose(): boolean {
+    return candidate === undefined && employee === undefined
+  }
+
   async function createApplication() {
     dispatch('close')
     const state = await client.findOne(core.class.State, { space: _space })
@@ -89,7 +93,6 @@
 </script>
 
 <Card label={'Create Application'} 
-      okLabel={'Save'}
       okAction={createApplication}
       canSave={status.severity === Severity.OK}
       spaceClass={recruit.class.Vacancy}
diff --git a/plugins/recruit-resources/src/components/CreateCandidate.svelte b/plugins/recruit-resources/src/components/CreateCandidate.svelte
index 9e7e64b882..c2658603dc 100644
--- a/plugins/recruit-resources/src/components/CreateCandidate.svelte
+++ b/plugins/recruit-resources/src/components/CreateCandidate.svelte
@@ -140,8 +140,6 @@
 <!-- <DialogHeader {space} {object} {newValue} {resume} create={true} on:save={createCandidate}/> -->
 
 <Card label={'Create Candidate'} 
-      okLabel={'Save'}
-      cancelLabel={'Cancel'}
       okAction={createCandidate}
       canSave={firstName.length > 0 && lastName.length > 0}
       spaceClass={recruit.class.Candidates}
diff --git a/plugins/recruit-resources/src/components/EditCandidate.svelte b/plugins/recruit-resources/src/components/EditCandidate.svelte
index fb3a3699dd..f4c33e2c37 100644
--- a/plugins/recruit-resources/src/components/EditCandidate.svelte
+++ b/plugins/recruit-resources/src/components/EditCandidate.svelte
@@ -89,7 +89,7 @@
     </div>
   </div>
 
-  Applications
+  <!-- Applications
 
   <TableView 
     _class={recruit.class.Applicant}
@@ -104,7 +104,7 @@
       }
     }
     search=""
-  />
+  /> -->
 
   <div class="attachments">
     <Attachments objectId={object._id} _class={object._class} space={object.space} {object}/>
diff --git a/plugins/view-resources/src/index.ts b/plugins/view-resources/src/index.ts
index bb2d67e079..6b37a2208f 100644
--- a/plugins/view-resources/src/index.ts
+++ b/plugins/view-resources/src/index.ts
@@ -23,13 +23,21 @@ import TimestampPresenter from './components/TimestampPresenter.svelte'
 import TableView from './components/TableView.svelte'
 import KanbanView from './components/KanbanView.svelte'
 
-import { getClient } from '@anticrm/presentation'
+import { getClient, MessageBox } from '@anticrm/presentation'
+import { showPopup } from '@anticrm/ui'
 
 export { TableView }
 
-async function Delete(object: Doc): Promise<void> {
-  const client = getClient()
-  await client.removeDoc(object._class, object.space, object._id)
+function Delete(object: Doc): void {
+  showPopup(MessageBox, {
+    label: 'Delete object',
+    message: 'Do you want to delete this object?'
+  }, undefined, (result) => {
+    if (result) {
+      const client = getClient()
+      client.removeDoc(object._class, object.space, object._id)    
+    }
+  })
 }
 
 export default async () => ({
diff --git a/plugins/workbench-resources/src/components/Workbench.svelte b/plugins/workbench-resources/src/components/Workbench.svelte
index b398b5d24e..e91e5cb1e0 100644
--- a/plugins/workbench-resources/src/components/Workbench.svelte
+++ b/plugins/workbench-resources/src/components/Workbench.svelte
@@ -79,15 +79,7 @@
     </div>
     {#if navigator}
     <div class="panel-navigator">
-      <NavHeader label={'Chat'} action={() => {
-        showPopup(MessageBox, {
-                                label: 'Dialog title',
-                                message: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor anem isto orem ipsum dolor sit amet?'
-                              }, undefined, (result) => {
-          if (result && result === 'OK') console.log('MessageBox - Ok!')
-          else console.log('MessageBox - Cancel')
-        })
-      }} />
+      <NavHeader label={'Chat'} action={() => {}} />
       <Navigator model={navigatorModel}/>
     </div>
     {/if}