ome minor fixed regarding screen switching