Fixed menu badge counts