messages directive replaced with ng-include, some cleanup