Add browser check
Add real visibility check