This change reorders some things in Window header so related things are kept spatially close to make the code easier to navigate.