Followup to be3bad3

- Simpler means of bringing composer windows to front, if manager dialog is going to be closed
Fix duplication of main app's Window and Help menu to composers for Mac