Add more component types and commit stylesheet fix for component layout