Fix some issues with screen navigation