Added switch screens
Fixed merge conflicts