Removed hard coded font name definitions.
Cleaned up font fix changes.
Merge pull request #772 from mrtizmo/corecomp_f

Corecomponents module - resolve hard coded font issue