Angular changes, and clean up plus some styling