Removed jquery code and update with Angular way instead