Organized, fixed screen switching bug