Fixed up window sorting and window number, etc.
Window is now being shown... There are some oddities in the full screen, but otherwise looks ok...