Fixed up container hierarchy within views.