fix text size in different resolutions
merge