Fixing the component title/label display issues.(DHH-477)

Please don't change whitespace -- it makes it much more challenging to figure out what's being changed.