Cleanup
Renumber windows