Add menu bar to Mac AND Windows
Add debug helper functions