Tdh merged 2

Agree these should be reconciled but I chose all these text sizes based specifically on what would fit in the grids for each screen size... so those dimensions need to remain the same. Are you comfortable changing all of the text_sizes to the font_sizes?