refinements of Jeremy code

Adjusted menu bar, various small changes.