com_wrapper layout override support

Add layout override support to com_wrapper.