Make better site switcher