Changed main Card layout to avoid unnecessary wrapping in the container renderer, renamed some elements to be more semantic