First commit - Now honours DISPAY_CATEGORIES_ON_MENU