Defined a a component
Passed properties to the component
Changed labels for better readability
Added yield support