add layout component
layout component fixes