fixes #3 - migrated to new menu structure