commit for composite view refactoring
Post-Composite View Implementation Pre-Func Fixes