cleaning up window menu code, notes in the todo