Added loading icon and field directives