Add web popup instead of native popup
Fix some issues
Add leader code