refactored toolbar/menu support