Updates to the view and layouts to efficiently handle block injection