Reorganize windows menu