Fix screen ID numbering to more logical.