Angular Overhaul

I did many things