More accurate tool window popup menu.

Separators added, texts are same for same cases.