JavaDoc
Some Refactorings

 - menu bar wrapper helper classes visibility
 - popup visibility
 - preferences -> settings