Fix typo
Add a bit of padding to body
Handle values when components represent a single val