Fixed the screen switching