Merge "Fixed a bug where the image and the text were overlapping" into nyc-dev