Added screen switching!!!!
Fixed screen switching