added some outlines and removed some ng-ifs