Changed Angular structure. Html cleanup