improve efficiency for angular
Some UX and performance fix