newLunch
some angular refactoring