Preliminary changes for Angular
Preliminary changes for Angular
HTML cleanup