Fixing deliver button

- Adding code to fix deliver button
- Do not removing message after clicking deliver button