Reduce complexicity
Reflect recent master changes
Fx preview url
Fix visibility warning