Added some logic for switching screens when changing zones