Significant improvements to custom view hierarchy