moved to newest angular and jquery