Add cancel button
Merge branch 'add-close-button'