html angular cleanup and js corrections