Code Clean
Change focus cross to url
Remove focus-cross switch