Removed all JQuery. Now simplier and only using Angular