Make changes to other components
Update other components and fix up some layouts to new api.