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