fixed merge problems with fonts and added colors, strings, etc. Fixed Top positioning of the text as well