Minor screen switching bugfixes