Design Changes and NgInclude Implementation