Use Angular Filter
Use new formatMenu functions