Header code optimized
Changes made to fonts
Merge branch 'issue-51' into develop
Merge branch 'issue-52' into develop