Implement modal dialogs functionality
Small adjustments