added switch screens