Fixed some comments and image.spec. Also, added containers for form.controls ui components.