Some changes, removed new font usage