Merge "Metadata component css changes"