rearranged menu entries
separated catalog menu entries from local options
config and fixes
Merge branch 'feature/catalog_accounts' into development