Changed all angular directives to data-ng-* and some cleanup