Merge "Editor component css changes"