Added angularJS components. Fixed some formatting