Add custom popup window.
Merge branch 'feature/custom-popup'