Added Web font
Remove complex functions