Tidy up window menu

Fixes #63