Fixing Logging issues

Also minor changes with angular Js